* Do not qualify gAudioHeapInitSizes with const under AVOID_UB
* Move gAudioTatumInit and gAudioHeapInitSizes to their own file, move data to rodata
* Space
* 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 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
* [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
* [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
* 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>
* 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
* 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
* 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>
* Add addresses for makerom and boot segments
* Mark entrypoint as the entry of the elf
* Add extra labels to macro.inc
* Use dlabel, jlabel and endlabel in disassembly
* Make jlabel global
* git subrepo pull tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "92b9ec72f"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "92b9ec72f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* Use `dlabel`s for non-functions in .text
* Add linker asserts
* Move framebuffer_lo to before the makerom segment to avoid `dot moved backwards` warnings
* fix
* Improve assert message
* fix
* Third fix
* Fix four
* Move undefined_syms to linker_script folder
* Make second linker script file to avoid abusing undefined_syms
* Update Makefile
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Rename to extra.ld
* Use entrypoint symbol on ROM header
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* deimplementation complete
* newlines
* match
* data import
* back port cleanup changes
* stuff
* naming and such
* all funcs provisionally named
* more stuff
* merge
* Fix merge issues
* begin cleanup
* Use constants for all face animation data
* Use THIS like almost every actor does
* Change "Light Ball" to "UFO"
* Rename the alien types
* EnInvadePoh -> EnInvadepoh
* Rename the types
* Rename some Twinmold stuff
* ConfusedRomani -> SilentRomani
* Fix stack size issues with EnInvadepoh_Cremia_Init
* Move a struct out of the header to where it belongs
* Some header cleanup and struct names
* Name remaining struct vars
* Some more struct var renames
* Finish reviewing the struct var names
* Rename most of the interactInfo stuff
* Consistency
* Remove unused union
* Define EN_INVADEPOH_LIMB_MAX like EndingHero6 does
* Fix header
* Update functions.txt and variables.txt
* Create macros for accessing spawn time and kill count
* Some defines
* Some minor comments and cleanup
* Rename some functions
* Comments for those three functions
* Draw function cleanups
* Some damaged and dead cleanup
* Death scale stuff
* Good chunk of alien functions
* Invasion state naming
* Weekeventreg naming
* Happy with >20% of functions now
* A couple more functions
* More consistent names for BSS variables
* Some Init cleanup
* Happy with 30% of the functions now
* Finish the abductors
* Some random functions to get the functions I'm happy with >1/3rd
* Use `InitPath` for everything
* UFO functions done, >40% functions I'm happy with
* Do a lot of work on InvasionHandler action funcs
* Finish invasion handler code
* InitVars
* Rename the "closest alien" stuff to "closest alien threat"
* Finish most of the dog functions
* Lots of small stuff here and there
* Finish documenting the dog bug
* Document `EnInvadepoh_Dog_IsCloseToPath`
* `EnInvadepoh_Dog_MoveAlongPath` and other fixes
* Simple comment for `EnInvadepoh_Dog_Move`
* Various path functions, finish dog
* Consistently use "SetMatrixTranslation"
* Change all the angleToPlayer stuff to pitch/yaw
* Some RewardRomani functions
* Finish RewardRomani
* Finish Night1Romani and BarnRomani, >75% of functions done
* Some minor stuff
* Document bug
* Finish all of SilentRomani minus the Idle functions
* Finish EnInvadepoh_SilentRomani_Idle
* Finish Night3Cremia
* Finish Night3Romani
* Finish `EnInvadepoh_Ufo_SpawnSparkles`
* Finish some library functions
* Finish the alien pathing stuff
* Finish Romani path stuff
* Finish all non-InteractInfo stuff
* InteractInfo -> ModelInfo
* Create a `EnInvadepohFaceAnimBase` struct
* Name some of the animation data
* Switch to `Chained`/`ChainedDelay` and do some other cleanup
* Name all of the animation data
* Finish documenting and cleaning up the face animation functions
* Some comments at the top of the file
* Clean up forward declarations
* Clean some stuff up to the ModelInfo functions
* Fix build
* Move the animation data around so all the ModelInfo functions are adjacent
* Review
* Use `CLOCK_TIME_MINUTE` in `EnInvadepoh_Alien_PathComputeProgress`
* Respond to some of Anghelo's review
* Update comment on spawn time macros explaining what indices are usable
* Create a `DEATH_SCALE` define
* `WEEKEVENTREG_RECEIVED_MILK_BOTTLE` -> `WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE`
* Forgot to do the bomber's notebook stuff too
* parallelogram -> rectangle
* Respond to engineer's review
* Slight spacing fix
---------
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Obj_Mine
* Obj_Mine
* Fixups
* Nonmatchings + cleanup
* Small cleanup
* externs
* structs complete
* wew
* some docs. still baffling
* documented physics stuff
* docs. physics be wack
* forgot some things
* format
* more cleanup
* merge and such
* format
* more format and cleanup
* asm stuff
* Update src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* now with decomp.me
* removed some extraneous macros I didn't end up using
* fixes and formats
* merge
* my god, it matches
* format
* removed macros
* more fixes
* format
* format
---------
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnDt deecomp first pass, two nonmatching
* Some cleanup, got the big boy matching
* Some light cleanup, documenting blinking behaviour
* Fixed last non-matching with some permuter silliness
* Decompilation complete
* Mayor documentation, first pass
* Updating some unknown vars in baisen
* Added an enum for mayor's cutscene state
* Formatting pass for mayor
* Cleaning up unk var in mayor meeting method
* Some cleanup and changes based on PR feedback
* Another cleanup and fix pass based on PR feedback
* Updated mayor event flags according to their usage
* All the parentheses
* Another round of PR feedback cleanup
* Having another crack at naming/cleanup based on PR feedback
* Renaming animation symbols
* Fixing broken references in other actors from anim rename
---------
Co-authored-by: GinNoOokami <noreply>
* Fix struct
* 20/79 OK
* BossHakugin_Draw OK
* func_80B0D69C OK
* func_80B0D2B8 OK
* func_80B0D750 OK
* Shadow function docs
* Fix some non-matchings
* Apparently this matches now? It didn't before
* OverrideLimbDraw OK
* BossHakugin_PostLimbDraw
* Animation Cleanup: En_G* (#1395)
* wip
* more cleanup
* more cleanup
* one more thing
* one more default case
* missed brackets
* PR Review
* add more matches and fill stuct
* 3 more Draw functions
* func_80B0E5A4
* Finshed the Draw functions
* Small cleanup
* Most of the death-handling code done
* more matching
* functions
* Goht collab (#9)
* Animation Cleanup: En_G* (#1395)
* wip
* more cleanup
* more cleanup
* one more thing
* one more default case
* missed brackets
* PR Review
* z_message_nes (1 NON_MATCHING) (#1394)
* Bring over progress
* Some docs
* scratch urls + format
* Fixes
* Match Message_DrawTextNES
* String macros
* color structs
* Document object_mk (#1389)
* Updated object_mk animation, limb, and skeleton names
* Updated object_mk texture and DList names
* Added comment to object_mk.xml
* Remove "ing" from Anim names
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update z_en_mk.c to not use "ing" in names
* Running formatter
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Player Docs: Initial framework for "Action Change Lists" (#1397)
* copy fig docs
* adjust wording
* another fix
* fix bool
* PR Suggestion
* Animation Cleanup: En_H* (#1399)
* begin H
* more cleanup
* Animation Cleanup: En_I* (#1400)
* cleanup I
* oops
* Start Player Item Docs (#1396)
* Copy Fig Docs
* small cleanup
* ItemChangeType comment
* bool
* item change comments
* PR Review
* rm comments
* Animation Cleanup: En_K* (#1402)
* cleanup k
* one more name
* Animation Cleanup: En_J* (#1401)
* cleanup J
* small fix
* functions
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Zach North <zrnorth@gmail.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
* hotfix
* all functions decomped
* all functions decomped
* Now with more data
* small fix
* another small fix
* ok last small fix I swear
* cleanup
* func_80B0A8C4 OK
* func_80B0D9CC OK
* Use generated reloc for Goht + remove Goht's undefined_syms
* Bodyparts + other clean up
* cleanup
* oops
* fix merge
* begin docs
* fix merge
* cutscene docs
* effects docs
* small docs
* Document colliders
* Odds and ends in the struct
* Name some functions
* Name two functions
* Some action functions and other odds and ends
* Name the lightning segments and electric ball functions correctly
* Names and other cleanup
* Start on hakurock + more cleanup
* Name all hakurock functions
* Name hakurock effects + create a GET_TYPE macro for it
* Finish documenting Hakurock
* Name one more function in BossHakugin
* Name a few more things
* Name a lot of struct vars
* Wall-related stuff
* Fix some fake matches
* Name a couple more struct vars
* Document some more of the struct
* Name the limb flag stuff
* Name the last unnamed struct vars
* Name the horn colliders correctly
* Some initial work on documenting data
* Some function documentation
* A couple of cleanups
* Finish documenting BossHakugin_UpdateBaseRot
* Name BossHakugin_SetLightningSegmentColliderVertices
* Document BossHakugin_AddLightningSegments
* Document BossHakugin_RunUpdateCommon and related functions
* Document BossHakugin_AddMalfunctionEffects
* Document BossHakugin_StepVectorToTarget
* Rename to BossHakugin_StepVector
* Finish documenting BossHakugin_AddMalfunctionEffects for now, might come back later though
* Document BossHakugin_UpdateSubCam
* Document BossHakugin_Thaw
* Document BossHakugin_ChargeUpAttack
* Some scattered docs
* Finish documenting the top "library" functions
* Document intro cutscene functions
* Document running and charging
* Document downed
* Document throwing
* Document remaining non-death action functions
* Document most of the death cutscene
* Get started on documenting crushing rocks
* Separate out the crushing rocks into their own struct
* Document the ExplosionLimbHideInfo
* Finish documenting BossHakugin_DeathCutsceneCrushedByRocks
* Almost done with rocks I think
* Port over Odolwa shadow documentation
* Finish documenting draw functions
* Finish documenting BossHakugin_Update
* Name variables in BossHakugin_UpdateElectricBalls
* Document BossHakugin_CheckForBodyColliderHit
* Finish documenting BossHakugin_UpdateDamage
* I've convinced myself these names are fine
* Almost finish documenting every update function
* Remove TODOs from the header
* Finish documenting the C file
* Delete duplicate define
* Finish variables.txt for Goht
* Undo change that desync'd z_eff_ss_fhg_flash.h from other effect headers
* Missed a THIS
* Some low-hanging review responses
* Add comment explaining something in BossHakugin_ShouldWait
* Match BossHakugin_SpawnLargeStalactiteWalls using a for-loop
* Create GOHT_ELECTRIC_BALL_COUNT_MAX constant
* vector -> norm and targetVector -> targetNorm
* Add TODO comments for dynamic shadow functions
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Parker B <20159000+jpburnett@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Zach North <zrnorth@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Some Decoder WIPs
* Improvements
* POC
* Fix bss
* another newline
* Staff OK
* Cleanup + fix progress script
* script cleanup
* Some docs
* makefile
* Extract text from extract_assets.py
* More docs
* Even more docs
* Other message assets
* Small cleanups
* Clean up decoders/encoders
* Message_SetupLoadItemIcon -> Message_DecodeHeader
* Some more docs
* Remove mkdmadata
* Fade Skippable
* More cmd docs
* 1 left
* Last notes
* HS_TIMER -> HS_TIME
* More general docs
* Format
* Note the charmap conversion for buttons in message_data_fmt_nes.h
* Remove trailing whitespace
* Small fixes
* PR
* data
* OK
* small docs
* docs
* Reloc
* Format
* this could have been a constexpr
* fix bss
* the rest of the fixes
* format
* revert makefile and clangformat
* comments
* Matching dmatable
* Generate NON_MATCHING dmadata
* Clean up dmamgr
* Format
* Ignore tools/buildtools/mkdmadata
* Warnings
* Use SYMS flag instead of segment name
* PR + more notes
* PR cleanups
Tharo