* Start documenting Toto
* Document EnToto_IsFacingPlayer and Unk2B6/isPlayerCancelingSoundCheck
* Rename EnTotoText to EnTotoSpeakData to align with EnTest3 (Kafei)
* Update gitignore
* Document some HandleTalk and SetupTalk functions similar to EnTest3
* Rename D_80BA502C to sEnTotoSpeakData1
* Document TalkState setup funcs
* Update gitignore, document talk state update functions (from En_Test3)
* Toto talk loop animations
* Update gitignore for functions.txt
* Document ActionFuncs
* Clean up remaining undocumented variables
* Clean up comments
* Run format.py and clean up result, and revert makefile changes
* Add missing newline at end of z_en_toto.h
* Clean up gitignore and other local stuff
* gitignore again
* Gitignore again again
* Gitignore again again again
* Restore old graphovl.py
* Update include/z64save.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Toto/z_en_toto.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Rename SetupAction and Action functions; fix block comments; create enum for TalkData
* move enum up so it's declared before it's used lol
* Change shouldCancelSoundCheck and ShouldPlaySoundCheckCompleteCutscene to bool
* Run format.py even though it makes the SpeakData array less readable yay
* Remove accidentally pushed files
* Enum for SpeakDataIndex
* SpeakDataIndex
* Index into SpeakData with enums
* Apply requested changes
* Apply clang-format
* Apply requested changes (rename SetPlayedFlags, add formsPlayed enum, fix a few missing enum replacements)
* Change enum to macros
* Apply more suggested changes
---------
Co-authored-by: AlexisACooper1 <alexis@lingualogica.net>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* [assets] Add TlutOffset to CI textures: misc, gkeeps, `object_[ab]*`
* [assets] Add TlutOffset to CI textures: `object_[c-i]*`
* remove extra space before TlutOffset
* [assets] Add TlutOffset to CI textures: `object_[j-n]*`
* [assets] Add TlutOffset to CI textures: `object_[o-z]*`
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Pr2: some docs, first struct pass
* Pr2: Most functions named
* Pr2: more docs
* Pr2: object documented
* Pr2: object documented
* Pr2: format
* Pr2: more docs, format
* Pr2: requested changes
* Pr2: requested changes
* Pr2: forgot prz used the object too
* Pr2: more skelton limb enum changes
* Pr2: removed old comment
Due to the layout of the pitch_frequencies lookup table, note values
computed in extraction were reflected around middle C (midi note
number 60). This didn't matter for matching, values would successfully
roundtrip. However when using samples in external programs or
converting soundfonts to standard formats the note values would lead
to incorrect playback of sounds. This change corrects the note values
so that external programs correctly infer the pitch of the sound when
played at a particular MIDI key.
* Document `EnMaruta`
* Document type from params
* Rename display lists properly
* Format
* Add ASCII picture to explain DL array
* Use boolean values for isRetracting
* Shorten name of zero vector
* Rename to gPracticeLogWholeDL
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Forgot to rename the other reference
* Rename to SetupRiseThroughFloor
* Add comments marking "on floor setup" as theory-only
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* PoComposer: some docs
* PoComposer: the rest of the object documented
* PoComposer: docs tweaked
* PoComposer: missing weekevent reg in a schedule file wasnt found by rename script
* PoComposer: document tweaks
* PoComposer: forgot the texture name
* Freezard: some docs
* Freezard: more docs
* Freezard: most function names
* Freezard: last function named
* Freeza: more docs
* Freezard: oops wrong actor name
* Fz: more docs
* Fz: more docs
* Fz: Object named
* Fz: Object named
* Fz: changed my mind, function names changed to reflect old OOT behavior not seen in this game, in case someone confuses them
* Freezer: docs
* Free: more docs
* F: format
* Fz: more docs
* Fz: format
* EnFz: more docs, format
* Fz: More minor docs
* Fz: more docs, format
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnFz: More requested changes
* Fz: updated function declarations
* EnFz: one of the flags was still 0
* Fz: updated functions.txt for disasm
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Kaizoku: some docs
* Kaizoku: more docs
* Kaizoku: more docs
* Kaizoku: all object labeled
* Kaizoku: more docs
* More docs
* Kaizoku: more docs
* Kaizoku: more docs
* Kaizoku: more docs
* Kaizoku: first pass complete
* format
* Kaizoku: minor tweaks
* Kaizoku: Anghelos requested changes pass1
* Kaizoku: minor docs
* Kaizoku: get'n't
* Kaizoku: format
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Kaizoku: back to OK
* Kaizoku: more requested changes
* Kaizoku: outfit and lipstick color enums
* Kaizoku: rename object assets from gKaizoku to gFighterPirate
* Kaizoku: LIMB_FULL
* Kaizoku: some requested changes
* Kaizoku: more requested changes
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Kaizoku: back to matching
* Kaizoku: requested changes
* Kaizoku: missed change
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Kaizoku: back to matching and more requested changes
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Ishi: some docs
* Ishi: more docs
* Ishi: more docs
* Ishi: field_keep assets labeled
* Ishi: format
* Ishi: minor docs/fixes
* Ishi: requested changes
* Spawn and Dust Funcs
* Ishi: only us version
* Ishi/Bombiwa: more requested changes
* Ishi: format
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Ishi: back to matching
* Ishi: a value got inverted somehow
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* 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>
* [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>
* 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
* [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>
* [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
* 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
* 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>
* En_Death new build system edition
* Fix merge
* Matched
* Fix merge
* Some names
* Suggested changes
* Further suggested changes
* Add value comments to MinideathAction
Alexis Cooper