* first round, need to investigate the others
* naming the remainder
* changed my mind on the name
* foooooormat
* fixing a number
* ...another one...
* names galore
* PR feedback
* fixing
* fixes
* 4mat
* adding "POE_SISTER"
* forgot a rename
* 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
* Move PictoActor typedefs to z64actor.h
* OK, data imported
* Minor snap stuff
* Name most functions and variables
* Name most of object, apart from animations
* Document snap
* Fix actors to use the PictoActor struct
* Format
* Finish documenting EnGe1
* Finish documenting z_snap and related actors
* Format
* Review, format
* Name last couple of things
* bss
* Review
* Review
* bss
* Introduce z64snap.h, add SCREEN_TO_DEVICE macros
* Back to PROJECTED_TO_SCREEN
* matched both
* use overlay reloc macro
* fix fake looking match
* PR fixes and change other overlay loading functions
* rename
* formatter
* fix build
* re format
* Import data for z_draw
* Match z_draw
* cleanup
* rupees
* Some object gi docs
* More documents
* Add explanation on function names
* more cleanup
* Fixed some things
* More docs
* Object docs WIP, still not done. I'll continue tomorrow
* More WIP, should just be mask gi objects left now
* Some masks done, many more to go
* cleanup
* Last masks finish
* Shield Stolen
* cleanup
* Apply various dicussions
* remove casts
* PR Suggestions
* Sync PowderKeg
* Document a ton of syateki_man
* Document swamp actor lists
* Document animations
* Document player positions
* Document talk flags
* Name wave and spawn index
* Name everything involved in the swamp game
* A hex score I missed
* Some slight town game doc
* Document octorok flags
* Better way of doing octorok flags
* Macros for getting/setting high scores
* Update a variable I missed
* Name remaining struct vars
* Create enum for shootingGameState
* Remove anonymous unions
* hitState -> hitType
* Comment for values next to enums
* Name some more stuff
* Name stuff in Town-RunGame
* Name sGameStartTimer
* Name some more stuff
* Name all static variables
* One more round of comments and such
* Respond to hensldm's review
* GET_INDEX -> GET_ID
* Respond to Elliptic's review (or at least the parts I can respond to right now)
* More review responses
* Add some stuff to z64saves.h I missed
* Message_GetState
* Rename msgCtx->msgLength
* Replace some enums
* TEXT_STATE_CLOSING
* use enum on switches
* use enum when assigning to a variable
* some minor cleanups
* minor cleanup
* TEXT_STATE_CHOICE
* remove unused temp
* z64message.h and z64view.h
* steal some stuff from OoT
* add some stuff to namefixer
* fix shift
* minor doc comment
* Update MessageContext struct from andzura's branch
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
* some other TextState uses I missed
* format
* statetimer in dec
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* Batch () commit
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* bss
* use text state defines on new actors
* fix matching
* bss
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* 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>
* z_map_exp OK
* some names
* Some more docs
* Update prototypes in functions.h
* Use reg name
* namefixer
* Respond to review
* Respond to review
* Respond to review
* Add some blank lines after breaks, whoops
* Respond to review
* Respond to Engineer's review, pt 2
* Respond to Engineer's review, Pt 3
* Add newline char to end of z64map.h
* Respond to engineer's review, Pt 4
* Respond to multiple reviews
* `ovl_En_Part` decompiled
* Suggested changes
* Rename body part displaylist
* Suggested changes
* Rename displaylist and params enum
* Remove randvar, rename enum from params to type
* 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
* Change Rand_Next to u32, document rand.c a bit more
* Clean up the quotes a bit, add another note
* Format
* — -> -
* Review
* Remove unnecessary casts
* Remove quote, reformat the comments
* Fix new files
* Make docs a bit more consistent and specific
* Format
* Match SkelCurve_Update
Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
* Match and document z_fcurve_data
* Begin documenting SkelCurve
* More documentation
* Deformat header
* Pluralise knotCount
* Sort out jointTable
* Rename frameCount
* Format
* More documentation
* Cleanup on DemoEffect
* Remove space on typedef
* Format, couple of fixes in the header
* Review
* Oops
* Fix EnBox, DemoTreLgt, use macros in EnTorch
Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
* Progress
* cleanup
* Fix comment
* progress
* OK
* Review pt1
* Update comments
* update comments some more
* Renamings
* Add headers and some parens cleanup
* Remove zelda64
* PR review
* bss
* Explain each relocation type a bit in the header comment
* Relocate_Addr macro
* Split off into z64load.h
* Adjust comment slightly based on OOT review
* OverlayRelocationType -> MIPSRelocationType
* Last bit of cleanup from OoT
* format
* Split off functions
* EnFamos: redo begin
* EnFamos: back to where I was previously
* EnFamos: matched looping draw function
* EnFamos: OK
* Famos: some docs
* Famos: some docs
* Famos: sfx convert pass
* EnFamos: some docs
* EnFamos: more docs
* Enfamos: more docks
* EnFamos: more doc
* EnFamos: more docks
* EnFamos: mass to dec
* Famos: limb enum
* Famos: more docs all functions named
* Famos: all struct mapped
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Famos: fix declaration order
* Famos: requested changes
* Famos: draw func using proper sSetupDL indexing
* Famos: fix text anim mismatch, change tlut to match gFamos SnakeCase
* Famos: formater pls
* Famos: requested changes
* Famos: more requested changes
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update assets/xml/objects/object_famos.xml
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Famos: requested changes and format pass
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Famos: more requested changes
* Famos: more requested changes
* Famos: another change
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Famos: made define macro for agro distance
* Famos: separated conditions on separate lines
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Improve various matchings and cleanup
* Fix warnings
* Missed 2
* Few hex to dec
* PR Suggestions
* More PR Suggestions
* Document time calculation
* Improved use of macros
* DAY_LENGTH macro
* More cleanup of functions
Co-authored-by: hensldm <https://github.com/hensldm>
* Missing a space
* PR Suggestions
* Use DAY_LENGTH more
* OK
* Initial documentation pass
* Pass 2. Add script by Tharo
* Renamed source file
* Documentation cleanup
* Update to latest master
* Feedback
* Bad merge
* Permissions
* Clang format
* Feedback
* format
* Use calculation instead of constant
* Rename as per suggestions
* Fix bss ordering and minor merge conflicts (from Maide)
* Update to current codebase and address feedback
* Fixup names to match new enums
* Format
* Fix duplicate include
* BSS shenanigans
* 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>
* First pass of `func_800BCCDC`
* river_sound OK (copy progress from audio WIP)
* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)
* More docs
* feedback
* Add in `code_8019AF00.c` functions
* format
* params
* Minor cleanup
* Small fix
* one more
* Better names
* Add comment, cleanup Idx
* Fix bss
* Fix BSS
* Being documenting `Actor_DrawDamageEffects` and apply to actors
* More doc progress
* Small cleanup
* Document display lists
* more cleanup
* Fix Typo
* PR Review
* Shock -> Spark
* Missed one
* Missed another
* Fix dust textures
* Remove `_tex` from `light_orb_tex` (so that it matches convention)
* electric stun -> electric spark
* Fix mistake
* Fix float
* spark -> sparks where applicable
* Missed even more shocks...
* Name `drawDmgEffTimer` for consistency
* Fix BSS
* cleanup
* Clean up toto
* More ClockTime macro
* rename pad
* EnGo and format
* EntityLineTest booleans
* Other bgcheck tests
* Graph Allocs
* Lib_Segmented
* Fix toto comment
* Remove macro comment for EnBigpo_DrawLantern
* Format and remove sym from undefined_syms.txt
* PR suggestions
* BgIkanaRay params
* One day i'll remember
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Decomp 10 functions in z_play, start documentation
* Add numbers to enums in z_en_torch2.h
* Decompile a 5 more functions (56 unattempted)
* Add more details, name some more variables
* Bit more Doxygen
* Format
* Fix arguments
* Add symbols to actorfixer.py
* Merge branch 'master' into play
* Fix z_actor
* Review
* Deduplicate CycleSceneFlags
* Fix warning
* Fix unk4
* Review
* starting
* a bunch
* and another bunch
* a bunch
* Match func_800EB1DC
* func_800EB4B4
* func_800EB6F8
* 2 more
* fix prototype of a random kankyo function
* func_800EBD60 non matching
* func_800EC678 matched?
* func_800EC6D4
* break
* func_800ECD7C
* A bunch of functions
* func_800EE200
* func_800EDF78 and func_800EE0CC
* func_800EDBE0 NON_MATCHING
* Cutscene_Init NON_MATCHING
* func_800EA324 NON_EQUIVALENT
* Fix warnings
* func_800EC924 NON_EQUIVALENT
* Cutscene_ProcessCommands NON_EQUIVALENT
* Format
* Split z_demo data and import it
* Import bss
* Match func_800EB364
* Rename Cutscene_Command_SetTime
* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)
* Improve Cutscene_ProcessCommands thanks to engineer and anon
* Cutscene_ProcessCommands NON_MATCHING
* Name some commands
* Fix
* Renames based on Engineer knowledge of Audio stuff
* More command names
* Cutscene_Command_GiveTatlToPlayer
* Some cutscene commands macros
* more command macros
* Macros for unknown commands
* Improve Cutscene_Command_Textbox a bit
* Rename stuff
* Name Terminator and Camera
* MOTIONBLUR
* Macros for textbox commands
* CS_PLAYER_ACTION_LIST
* A few macro renames
* Small cleaning
* A bit more of cleanup
* Rumble
* Entrance comments in func_800EB6F8
* Some var renames
* CS_CMD_FADESCREEN
* More clean up
* Clean functions protos
* Move CutsceneStateHandler out of z64.h
* Cutscene_DoNothing
* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex
* And more renames
* name some stuff in the cutscenecontext struct
* npcActionIndex->actorActionIndex
* Undo names of CS_STATE_ enum
* Name Cutscene_ActorTranslate family of functions
* small docs pass
* sfxconvert and format
* Hopefully last cleanup
* Add some missing functions to actorfixer
* Fix merge issues and remove trailing commas
* Cutscene commands fix
* Cutscene_Command_Misc improved by engineer
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Address review
* bss
* Match Cutscene_Command_Textbox by anon58
* Fix merge issues
* Match Cutscene_Command_Misc by @hensldm
* review
* float time macros
* fix merge issues
* format
* Fix building assets
* fix merge issues
* format
* Fix
* format
* fix merge issues
* fix
* fix
* format
* fix issues and run format
* bss
* Fix conflicts, bss and formatter
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* address review and fix some stuff
* fix merge problems
* more fixes and format
* Fixes
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Engineer suggestions
* format
* Elliptic review
* Use dec for ShrinkWindow_SetLetterboxTarget
* add a few comments
* Cutscene_Command_ChooseCreditsScenes
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* format
* some cleanups and some comments
* change actorActionCmd from hex to dec in the codebase
* minor comment on textboxcmd
* ahhhh
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* brackets
* minor comments
* rewording
* im dumb
* brackets
* another bracket
* Dawn of the New Day
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* fixes
* Cutscene_Command_TransitionFX by Anon
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.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>
* Copy progress from z_camera
* cleanup functions.h
* Oops
* Revert `SUB16` and `ADD16` back to original names
* PR Suggestions
* PR Suggestions
* Fix merge with master
* 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>
* Decomp Bba_01
* Doc bba01
* Document object_bba
* Remove new line
* Cleanup/rename EnHy to help differentiate it from overlays
* Adjust xml comment
* PR suggestions
* English is hard
* English is hard 2
* Add note about invalid textIds
* typo
* Fix merge
* Remove 0 defines
Derek Hensley