* 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>
* begin cleanup
* more cleanup
* more cleanup
* more cleanup
* more cleanup
* more cleanup
* fake matches
* more cleanup
* more cleanup
* small thing
* PR Review
* PR Review
* 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>
* begin anim R
* sTexturesDesegmented
* more misc docs
* more misc cleanup
* small adjustments
* oh sneaky
* PR Review
* adj comment, reads better
* missed an enum
* this one actor reverses true/false
* bool
* CARNIVOROUS_LILY
* begin next cleanup
* more cleanup
* climbAnim
* more cleanup
* more
* quick, a few more before anyone looks
* PR
* another fix
* table
* another small cleanup
* PR Suggestion
* Some pathing docs
* Missed one
* Uno mas
* Uno mas x2
* Cleanup
* fix
* namefixer
* NULL
* More
* PR
* Actually remove SQ
* -1 define, plus some more pathing cleanup
* Actor macros instead
* Format
* ADDITIONAL_PATH_INDEX_NONE
* Remove reliance on PATH_INDEX_NONE
* Missed some PathIndex cleanup
* Review
* format
* a lot of brackets, and some other things
* oops
* another bracket
* check flag all
* just a few more...
* PR suggestions
* PR comment
* pr
* one more bracket
* Rename Player_UpdateBottleHeld
* Match func_808497A0
* func_80852290 NON_MATCHING
* Match func_8083B3B4
* Params cleanup
* Match func_8083FBC4
* sfxId cleanups and others
* Fix declaration of functions from D_8085D990
* Change D_8085BE84 to be a 2D array
* ARRAY_COUNT_2D
* Match func_8085ADA0
* func_808426F0 nonmatching
* Match func_80852290
* Match func_808426F0
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Add notes to Player_SetDoAction
* Name putAwayCountdown
* rebase
* Match func_80856918
* format
* func_8084933C nonmatching
small amount of boomerang documentation
* Progress on moving data near where it is used
* finish moving data
* format
* cleanup up remaining data
* more match
* Some minor cleanups
* PlayerCsMode enum
* func_80851F18 nonmatching
* Fix unk_B10
* Purge ExchangeItemID enum
* Rename `targetActor` to `talkActor`
* Name `targetedActor`
* PLAYER_LIMB_BUF_SIZE
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Change SkelAnime Player functions to take a void pointer for the corresponding buffers
* Use PlayerAnimationFrame on Player_DrawImpl
* Match func_8082F1AC
* Match func_8083D23C
* cleanup
* Match and clean up func_808373F8
* Match and document func_8083A98C
* PLAYER_PARAMS macro and PlayerInitMode enum
* Preliminary names for InitMode functions
* Match func_8083C8E8
* remove redundant externs
* Match func_8084933C
* cleanup func_8084933C
* Access D_8085BE84 directly instead of using a macro
* Match func_8084AC84
* Fix boomearng typo
* OK boomerang
* cleanup func_8083D168
* untargetedRotY
* this->unk_14E = ABS_ALT(var_v1);
* GIFIELD macros
* sort of a match
* Match func_8084C16C
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Use the same trick to match func_808573A4
* Add note on Deku spinning
* Match func_8084D18C
* Match func_80850D68
* Improve func_80832660
* Match func_80854EFC
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Rename unk_B2A to getItemDrawId
* Some cleanup
* fix merge issues
* format
* minor anim docs
* Match func_808553F4
* Cleanup func_808553F4
* func_8083D860 nonmatching
* Match func_8083D860
* Defake func_80859BA8
* ()
* Add notes to PlayerAnimGroup enum
* underwaterTimer
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* some stateFlags cleaning
* more stateFlags cleaning
* some notes and minor cleanups
* more general cleanups
* Slightly less fake func_80832CAC
* Document some melee weapon damage stuff
* Mark lunge storage
* Note PCS patch
* match
* add notes to bss
* yeet extra indentation
* add reloc as nonmatching to spec
* floorSfxOffset
* Player_GetFloorSfx
* Player_GetFloorSfxByAge
* Comments for AnimSfx dunctions
* Name some AnimSfx functions
* Name AnimSfx stuff
* Some PlayerAgeProperties notes
* use animflag defines
* Player_SpawnExplosive
* fix enum and some other minor fixes
* Bit more misc. cleanup
* Use OoT's version of func_808333CC
* Note on quickspin buffer
* Final nonmatching, func_80851F18
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* RIP player.c
* Name Player_StopHorizontalMovement
* misc fixes
* Actor_DeactivateLens
* fixes
* typos and tweaks
* minor stuff
* add names as comments on the animgoup array
* Correct some function names and data type
* add anim commets to ageproperties
* some notes
* De-fake func_80840F90
* Defake & clean up func_8085ADA0
* Improve func_80859BA8
* Enums in func_80852B28
* Name some secret-related things
* 3 small things
* stuff
* Player_TalkWithPlayer
* SurfaceType_GetFloorType
* SurfaceType_GetWallFlags
* and more bgcheck stuff
* more bss naming
* sPlayerControlInput
* clean up func_80836F10 a bit
* name the parameters of func_80835BF8
* door stuff
* remove NON_MATCHING
* remove D_8085D2B0 padding
* Name some Player_Cutscene_ functions
* various cleanups
* format
* remainingHopsCounter
* some cleanups on the struct
* Actor_RequestRumble
* this->exchangeItemId = PLAYER_AP_NONE;
* fix merge stuff
* format
* PlayerUnkAA5
* Name two cylinder-related functions
* BSS
* Add MagicConsume's enum, treat lensActive as bool
* Update func_808332A0 based on better info
* fix merge
* fix merge issues
* remove redundant comments
* Name Player_AddQuake
* ANIM_FLAG_UPDATE*_*Y
* Format
* AT_TYPE_ENEMY
* fix merge issues
* format
* fix uintptr_ts
* Rename
* Name leftHandMf
* fix merge issues
* format
* exchangeItemId <= PLAYER_IA_MINUS1
* getItemDrawIdPlusOne
* currentActorCsIndex
* <= PLAYER_IA_MINUS1
* fix merge issues
* format
* namefixer and bss
* fix build
* bombs parameters cleanup
* bss
* Fix building
* fix building
* Fix building
* Fix building and cleanups
* Pre-PR cleanup
* really...
* format
* review
* stateFlag Mistakes
* 268 * 0.1f
* z64door.h
* fix cutscene stuff
* bss
* Update include/z64player.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update include/z64player.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* reiew
* PR Review
* collision
* review
* format and a few stuff i missed
* EnBomExplosiveType
* weekeventregconvert and eventinfconvert
* more review
* review
* bss
* review
* re format sGetItemTable
* Entangle PlayerMask and PlayerItemAction
* a few extra cases i missed
* bss
* review
* EnArrow stuff
* ARROW_MAGIC_DEKU_BUBBLE
* minor format
* merge
* fix bss
* review
* !ARROW_IS_ARROW
* review
* bool cleanup
* fix merge
* review
* Player_StopCutscene
* Player_RequestQuake
* quakeIndex
* Player_RequestQuakeAndRumble
* knobDoor and slidingDoor
* bss
* fix
* review
* dog and float
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Make names related to animations more consistent
* Standardize on sAnimationInfo
* Respond to hensldm's review
* Standardize on ChangeAnim
* Respond to hensldm's review
* Small formatting thing
* Consistency after merging master
* A few more things I missed
* Respond to Elliptic's review
* Some more stuff that was requested
* OK, data imported
* Fix some typos
* Start docs
* Struct almost finished
* Start object, add state enum
* undefined_syms
* Finish object, name some more stuff
* Name a few states and another function
* PlayState
* Minor tweaks in z_room and z_sub_s
* Complete documentation
* spec
* Review 1
* functions.txt
* Schedule result enum
* Rename schedule results
* Review
* Remove update comments
* Inventory_DeleteItem
* PLAYER_STATE
* Format
* Review
* Update struct name
* Merge in sub_s_models
* Update subs DL names
* Unused Weight pathing
* Function headers for weightpathing
* TimePathing WIP
* Timepathing, still unsure about unk184
* Move subs functions from functions.h to z64subs.h
* Add fake comment
* Some cleanup and renames
* Renames/cleanup of actors that use timepath
* Cleanup
* More cleanup
* Rename unk stuff
* Merge in upstream/master
* TimeElapsed -> elapsedTime
* Fix
* Final cleanup
* SubS Time Paths
* Still needs dialog action functions
* Fix waypoint comments
* Review pt. 1
* Baba review
* ScheduleResult -> ScheduleOutput
* Forgot to update functions.txt oops
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Finish up docs
* Fix order comments
* Fix
* Change bombShopkeeper struct member to
* Fix a few merge mistakes
* Add ScheduleOutput to namefixer
* format
* Format and fix merge
* Review
* PR
* z64schedule.h
* text summary
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* PlayState rename
* Make this work with the latest master and run format
* Respond to hensldm's review
* Respond to Elliptic's review
* Add Effect_GetPlayState to namefixer.py
* Add missed comma
* Bring code over
* Rename
* clean up variables.h
* Bring over some more code as well as cleanup
* remove newline in functions.h
* format
* Add plane functions
* Remove from actorfixer
* Add some more docs to plane functions
* Use temp for better format
* change func_8013E8F8 to return an s32
* rename origin back to pos
* format
* Add docs to SubS_ComputePlane
* format
* gfxContextPtr -> globalCtx
* bss
* Better docs of SubS_ComputePlane
* Normal -> unitVec
* Review pt. 1
* Update plane comment
* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther
* Add subs texture defines
* Update include/z64math.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* progress
* it matches mostly
* symbols
* done for now
* fix warnings and stuff
* formatter
* NON_EQUIVALENT
* pr fixes
* formatter and actorfixer
* fix pm
* more fixes
* PR fixes
* it actually builds again
* matching function
Co-authored-by: Louis <louist103@pop-os.localdomain>
* Bring cutscene code over
* Document cutscene functions
* Bring over flags code
* Document flags
* Bring Object code over
* Document object functions
* Better infinite loop comment
* Remove Effect_add correction
* Bring func_8013D5E8 code over
* Document angle helper
* ActorFixer
* Rename angle helper
* Missed gs
* Should probably test before commiting
* Better angle helper name as well as typo fix
* English is hard
* Len to num
* Fix merge
* Fix merge
* Format
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Bring over the matching code, rename struct vars to be consistent, and move animation structs to z64animation.h
* Clean up function prototypes
* Format and some stack var renames
* Update tutorial
* Rename animation structs
* Rename SubS functions
* Rename Actor function
* Rename arg names
* Bring over code for func_8013D9C8
* Rename and cleanup
* Some more cleanup
* Small cleanup
* Animmode enum
* Adjust actorfixer
* More uses of animmode enum, as well as fixing typo
* Change hex 0xD to 13
* typo
* Fix merge
* Format
* Fix merge
* Actorfixer
* Format
* Bring code over
* Change ActorDraw typedefs from actor to thisx
* Rename functions
* Format
* Rename and clean up limb draws
* Some more limb draw cleanup
* Some more cleanup
* Function comments
* Last bit of cleanup
* update tutorial
* More tutorial and format
* Remove extra newlines form actorfixer
* Missed one
* Remove some unnecessary casts
* Fix SkelAnime transform functions in functions.h
* Remove bug comments, and add note
* Remove some more unneeded casts and rename one variable
* format
* Fix merge
* Format
Tom Overton