* 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>
* 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>
* 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
* 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>
* 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>
* 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>
engineer124