* starting en_ik
* updating and more matching funcs
* matched more functions and ran format.sh
* matched another, started on init
* updating things with master, and more matches
* another function down
* some more progress
* some documenting
* master merge
* maybe some progress?
* one more func left
* IK OK
* inital cleanup passthrough
* fixing warnings and formatting
* some cleanup
* touch up
* more docs
* doin dat dere docs
* actorfixer
* finishing function names
* initial round of fixes
* format
* Naming things
* namefixer
* review comments pt2
* comment updates
* PR Feedback
* forgot a format
* naming enum
* more fixes
* minor fix
* minor fix
* format
* fixes for daaays
* for some reason these keep showing up?
* fixing blob
* names
* fixes
* naming things...can't discern the last ones...
* updating TLUT and names
* formating and fisxes
* fixing func name
* naming effect variable
* name fixer, and renaming variable
* Fixing xml
* forgot to fix name
* Document object_uch (Aliens)
* Remove dummy label match that has been annoying me for a year!!!!!!!!!!!!!
* Respond to reviews
* Fix a small thing brought up in review
* Swap to gAlienJerkingAnim
* test commit
* undoing test commit
* making sure this is the right repo
* removing test file
* init for OSH bombable wall started. put back Actor* in function declarations.
* BgKin2Bombwall_Init is matching.
* started z_bg_kin2_bombwall destroy function. One mismatch right now.
* BgKin2Bombwall_Destroy matches.
* BgKin2Bombwall_Draw matches.
* Fixed BgKin2Bombwall_Init
* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.
* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.
* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.
* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.
* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall
* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.
* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090
* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090
* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.
* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.
* moving declarations around, ordering.
* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.
* ovl_Bg_Kin2_Bombwall data imported. Matching.
* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.
* Removed extra comments for ovl_Bg_Kin2_Bombwall.
* unpushed stuff. dunno.
* forgot to save z_bg_kin2_bombwall.c
* need to commit before make-ing in master.
* Ported z_bg_kin2_bombwall's code. Data next.
* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.
* Added comments to remember what does what in z_bg_kin2_bombwall.
* Some comments in z_bg_kin2_bombwall.c and function names ideas.
* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.
* Renamed most functions and some variables in z_bg_kin2_bombwall.
* Made a name suggestion for func_80B6E020 after testing in game.
* Ran format.sh.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
1 and 0 replaced by true and false in func_80B6E020.
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Bending to the x-- supremacy.
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.
* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.
* Screwd up formatting.
* Thinking of playing with object_kin2_obj.
* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.
* Had forgotten an arg1 in z_bg_kin2_bombwall.c
* First commit for ovl_Bg_Ikana_Mirror branch.
* Started decompiling ovl_Bg_Ikana_Mirror. Setup functions and _Update done matching.
* Replaced a float by its fractional representation. I need to learn float magic.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.
* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.
* Working on BgIkanaMirror_Destroy. Stack and registers left essentially.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.
* Removed some unnecessary comment.
* almost done with BgIkanaMirror_Destroy function.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* BgIkanaMirror_Destroy OK.
* Almost done with BgIkanaMirror_Init. Mostly stack stuff left.
* Registers and stack left to fix for BgIkanaMirror_Init.
* BgIkanaMirror_Init matching.
* Ran permuter to improve BgIkanaMirror_Draw's score.
* Actually not mad at permuter for BgIkanaMirror_Draw headstart.
* Matched func_80B7F730 in ovl_Bg_Ikana_Mirror. Progress on its _Init done too.
* func_80B7FA9C in ovl_Bg_Ikana_Mirror is matching. _Init left then documentation.
* Mistake in last commit message: actually, _Draw is left for ovl_Bg_Ikana_Mirror.
* Going to do some groceries, so pushing. About 2/3 across func_80B7FBA4 in ovl_Bg_Ikana_Mirror.
* func_80B7FBA4 in ovl_Bg_Ikana_Mirror is matching. _Draw then data left.
* Need to switch branch.
* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.
* Switching branch.
* Learning to decomp draw functions with BgIkanaMirror_Draw. YEP
* Switching branch.
* Went through the first wave of graphics macros attempts for BgIkanaMirror_Draw.
* Removed some temps in BgIkanaMirror_Draw.
* Second pass of macro attempts for BgIkanaMirror_Draw.
* Diff score for BgIkanaMirror_Draw at 1873. Getting there.
* BgIkanaMirror_Draw diff score down to 854. 4 instructions off and registers to fix.
* Instructions are matching for BgIkanaMirror_Draw. Registers left.
* BgIkanaMirror_Draw matches. Data next. Adding some co-authors
* BgIkanaMirror_Draw matches. Data next. Adding some co-authors
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tom-Overton <hensley.derek58@gmail.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
* Data imported and OK.
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
* Removed commented lines of unused code and useless externs. Documenting C file and object next.
* Renamed fields in actor and variables in 3 functions for ovl_bg_ikana_mirror. Some conventions applied.
* Renamed more variables in the struct and C file for ovl_bg_ikana_mirror.
* More cleanups and naming in ovl_Bg_Ikana_Mirror.
* Renamed some functions in ovl_Bg_Ikana_Mirror. More cleanups. Object documentation next once function names confirmed.
* Renamed collision header, animated textures and display lists for ovl_Bg_Ikana_Mirror in ovl_Bg_Ikana_Mirror and object_ikana_obj. Some textures left to rename.
* Renamed textures only used by ovl_Bg_Ikana_Mirror. Must go back through docs for conventions and styles plus an extra cleanup before PR.
* Went through merging and review docs for extra cleanups. Adding co-authors for documentation.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
* Creating branch to merge ovl_Bg_Ikana_Mirror.
* Fixed the merge from zeldaret/mm. ovl_Bg_Ikana_Mirror OK and documented. PR-ready.
* Applied first batch of fixes from PR comments. Adding co-authors for documentation and a function rewrite.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
* Renamed the colliders in ovl_Bg_Ikana_Mirror's struct and fixed naming in object file plus spacing cleanups.
* Full rename for data and temps with respect to the mirror's and light rays' respective colliders.
* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Formatting needed to be applied after commiting suggestions.
* Renamed more textures and removed unnecessary array sizes in the data.
* Forgot to run formatter.
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
* test commit
* undoing test commit
* making sure this is the right repo
* removing test file
* init for OSH bombable wall started. put back Actor* in function declarations.
* BgKin2Bombwall_Init is matching.
* started z_bg_kin2_bombwall destroy function. One mismatch right now.
* BgKin2Bombwall_Destroy matches.
* BgKin2Bombwall_Draw matches.
* Fixed BgKin2Bombwall_Init
* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.
* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.
* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.
* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.
* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall
* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.
* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.
* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090
* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090
* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.
* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.
* moving declarations around, ordering.
* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.
* ovl_Bg_Kin2_Bombwall data imported. Matching.
* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.
* Removed extra comments for ovl_Bg_Kin2_Bombwall.
* unpushed stuff. dunno.
* forgot to save z_bg_kin2_bombwall.c
* need to commit before make-ing in master.
* Ported z_bg_kin2_bombwall's code. Data next.
* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.
* Added comments to remember what does what in z_bg_kin2_bombwall.
* Some comments in z_bg_kin2_bombwall.c and function names ideas.
* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.
* Renamed most functions and some variables in z_bg_kin2_bombwall.
* Made a name suggestion for func_80B6E020 after testing in game.
* Ran format.sh.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
1 and 0 replaced by true and false in func_80B6E020.
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Bending to the x-- supremacy.
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.
* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.
* Screwd up formatting.
* Thinking of playing with object_kin2_obj.
* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.
* Had forgotten an arg1 in z_bg_kin2_bombwall.c
* Replaced a float by its fractional representation. I need to learn float magic.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.
* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.
* Removed some unnecessary comment.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Rand_Next() update.
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Rand_Next() update.
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by: Derek-Hensley hensley.derek58@gmail.com
Co-authored-by: Maide eeeedddccc@hotmail.co.uk
Co-authored-by: Tom-Overton tom.overton@outlook.com
Co-authored-by: Fig02 fig02srl@gmail.com
Co-authored-by: Parker-Burnett burnettparker@gmail.com
Co-authored-by: isghj5 isghj5@gmail.com
* Adding Co-authors
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>
* Bg_Ikana_Dharma decompiled
* Bg_Ikana_Dharma more stuff
* remove & from function pointers
* use THIS macro
* use THIS macro
* return -> else
* GET_PLAYER
* slightly better match (this2 only used once)
* fix warnings; name variables
* better match in BgIkanaDharma_Init; more param macros
* Rebase to latest master and some minor cleanup
* More cleanup
* Document object
* Respond to isghj5's review
* Respond to Elliptic's review
* Better pack macro
* Respond to hensldm's review
Co-authored-by: immibis <immibis@gmail.com>
* Start zora
* Finish zora
* BombShopkeeper with some cleanup
* Goron and don gero mask
* Small thing
* format
* PR comments
* bombshopkeeper -> bomb_shopkeeper
* gEffShockwaveDL
* Most of object_stk done
* Document the original name for every animation
* First pass names on every single animation
* Enum for animations
* Enum for limbs
* Very low hanging fruit in dm_stk
* Document a lot more in dm_stk
* Name most remaining struct vars
* Name a bunch of functions
* First pass names to all sound functions
* Name most functions
* Name all other object symbols used by dm_stk
* Name all remaining functions and struct vars
* Much better animation names and documentation
* Lots more function documentation
* Document some stuff
* Name the title cutscene thing
* Last little bit of cleanup
* Format
* Rename SFX functions
* Fix typo in header comment
* Respond to Elliptic's review
* Respond to Elliptic's clarification about Version1/2
* hitCount -> deflectCount
* Take into account some of the feedback that was given for DmZl4
* Cleaned up yasi by giving symbols descriptive names
* renamed variables to palm tree
* Adding descriptive comment to root of xml asset file
Co-authored-by: MrPolymorph <{ID}+{username}@users.noreply.github.com>
* 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>
* EnSnowman_Init OK
* EnSnowman_Destroy OK
* func_80B173D0 OK and better match for EnSnowman_Init
* EnSnowman_Draw OK
* func_80B19948 OK
* func_80B19998 OK
* func_80B19718 OK
* func_80B1746C and func_80B177EC OK
* Match a ton of functions
* func_80B18B30 OK
* func_80B180A4 OK
* func_80B18C7C OK
* func_80B18124 OK
* EnSnowman_Update OK
* func_80B17144 OK
* func_80B19474 OK
* func_80B18F50 OK
* All functions OK
* Import data to C
* Use object symbols
* Misc cleanup
* Fully document object_snowman
* Low hanging fruit
* Document snowman types
* Some more minor stuff
* Some more minor cleanup and naming
* Name some more functions
* More names
* Even more names
* Turns out, they're called Eeno!
* limbPos -> bodyPartsPos as per Fig's suggestion
* Update some more names
* Committing so I can push up stuff for the snowballPos naming
* More names + use generated reloc
* First pass name on every function
* First pass names on all struct vars
* Document the mega eeno glitch
* Get rid of garbage "split dead" naming
* First pass documentation on combine state
* Better names and some documentation
* Last doc pass before PR
* Respond to Elliptic's review
* / 100.0f -> * 0.01f
* Limbs, skeleton, limb DLs, main textures
* Finish documenting object_shn
* Name the eyeIndex variable in syateki_man
* Use limb enum in syateki_man
* One more limb enum I forgot, sorry
* Respond to Elliptic's review
* 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>
* EnRaf_Init OK
* func_80A17060, func_80A18080, and func_80A180B4 OK
* EnRaf_Destroy, func_80A1712C, func_80A171D8, and func_80A17414 OK
* func_80A17464 and func_80A17530 OK
* EnRaf_Draw OK
* func_80A175E4, func_80A17848, and func_80A178A0 OK
* func_80A18A90 OK
* func_80A179C8 and func_80A17C6C OK
* func_80A1859C OK
* func_80A17D14 and EnRaf_Update OK
* func_80A18B8C and func_80A18DA0 OK, EnRafParticle documented
* func_80A16D40, func_80A16D6C, func_80A17D54, and func_80A17DDC OK
* func_80A17E1C OK
* Use object symbols
* Import data to C and use generated reloc
* Misc cleanup
* Document animations and skeleton
* Finish documenting object_raf
* Some low-hanging fruit
* Some actions I figured out
* Name revival stuff
* Document type stuff
* Bob and player height stuff
* Name a few more things (some of the names are bad but whatever)
* Finally move Vec3f data inline like I've wanted to do for ages
* Some more low-hanging fruit
* limbRot name
* Name the chew stuff
* First pass names on everything, even if they're bad
* Some last-minute stuff before PR
* Respond to Elliptic's review
* Manually specify texture dimensions
* Format
* Add comment about pointless check
* Respond to Elliptic's second review
* Name all animations
* Skeleton, limbs, and limb display lists
* Remaning dlists
* Limb enum
* Name all textures
* Minor cleanup on object_dnk
* hair -> headdress
* EnBbfall_Init OK
* EnBbfall_Destroy, func_808BF5E0, and func_808BF734 OK
* func_808BF578 and func_808BF7A0 OK
* func_808BF4B4, func_808BF830, and func_808BF894 OK
* func_808BF438, func_808BF514, func_808BF8DC OK
* func_808BFA18 and func_808BFA3C OK
* EnBbfall_Draw OK, thanks Tharo, Anon, and Maide!
* LimbDraw functions OK
* All functions OK, thanks Anon for the loop in Update!
* Migrate data to C
* Use generated reloc and object symbols
* Port over a ton of documentation from EnBb
* Use ARRAY_COUNT for all loops
* Do a ton more documentation
* Name unused animation in object_bb
* Copy "floorType" variable name from OoT
* Use enum values for collider type
* Respond to reviews
* Add comment explaining EnBbfall_IsTouchingLava
* Initial implementation of Obj_Dora
* Final function and documentation for Obj Dora
* Implemented review feedback
* Moved enums inside dora c file, renamed temp to timeHalfHour
* Cleaning, renaming, moving and converted float to easily searchable value
* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK
* func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK
* func_80A361F4 OK
* Decomp a bunch of functions
* Better match for func_80A368E0
* func_80A36CB0 OK
* Draw functions OK
* All functions OK
* Import data to C
* Use object symbols
* Final cleanup and generated spec
* Remove something I missed
* char -> UNK_TYPE1
* Respond to reviews
* Remove static from unnamed variables, whoops
* EnDragon_Init OK
* func_80B5EDF0 OK
* func_80B5EAA0 OK
* EnDragon_Destroy OK
* EnDragon_Update OK
* func_80B60138 OK
* func_80B5EE3C OK
* func_80B5EF88 OK
* func_80B5F418 OK
* func_80B5ED90 OK
* func_80B5EB40 OK (commented out because data is not imported yet)
* Import data into C
* Uncomment func_80B5EB40
* func_80B5EFD0 OK
* func_80B5F3A4 OK
* func_80B5F888 OK
* func_80B5FCC0 OK
* Draw functions OK
* func_80B5FD68 OK
* func_80B5F508 OK
* func_80B5F8D8 OK
* Better match on func_80B5FD68
* Use generated reloc
* Remove undefined_syms for this actor
* Some minor cleanup
* Make the data like Anghelo said
* Document object_utubo
* Name a bunch of stuff
* Name some more stuff
* Some documentation around death
* Documentation for actions
* Name a bunch of junk
* Use regs instead of directly accessing gGameInfo
* Name the player position vars
* Update weekEventReg references
* Name and list out states
* Name timer
* Document extend stuff
* Finish documentation
* Respond to Anghelo's review
* Respond to hensldm's review
* The thing Anghelo suggested *actually* matches
* Initial decompilation of hariko
* Documented and touched up on ObjHariko header
* Documented Hariko assets and added review suggestions
* Added file comment, shuffled function order
* Added DL suffix to hariko dlists
* Updated hariko body out name to hariko_body
* EnWallmas_Init and EnWallmas_Destroy OK
* func_80874B88 OK
* func_80874BE4 OK
* func_80874D1C OK
* func_80874DE8 OK
* func_80874F14 OK
* A bunch of small functions OK
* A bunch of smaller functions OK again
* func_808752CC OK
* func_808758C8 OK
* func_80875910 and func_8087596C OK
* func_808756AC and func_8087571C OK
* EnWallmas_Update OK
* func_80875A74 OK
* func_80874A88 and func_80874B04 OK
* A bunch of functions OK
* func_808759B8 and func_80875A0C
* EnWallmas_Draw OK
* func_808760A4 and func_80876118 OK
* func_80875F04 OK
* Use object symbols
* Import data to C
* Use generated reloc
* Document object_wallmaster
* Misc cleanup
* Name the DrawDamageEffects variables
* Name draw functions
* Enum for damage values
* Port function names from OoT
* Last cleanup before PR
* Respond to Elliptic's review
* Respond to Elliptic's second review
* gWallmasterWaitAnim -> gWallmasterIdleAnim
* Change all EnWallmas to Wallmaster (except the actor's name itself)
* Respond to hensldm's review
* Fix merge conflicts
* this is the guay
* do you know the guay?
* No guay!
* got too excited to pr lol, fixes are here
* Majoras Mask: No Guay Home
* fixing objects
* 4mattt
* EnBb_Init OK
* EnBb_Destroy OK
* func_808C20D4 OK
* func_808C2238 OK
* func_808C1FF4 OK
* func_808C1E94 OK
* func_808C2344 OK
* func_808C23EC OK
* EnBb_Update OK
* func_808C2E34 OK
* func_808C254C OK
* func_808C272C OK
* func_808C2B94 OK
* func_808C2A00 OK
* func_808C1F00 OK
* func_808C1F74 OK
* func_808C25E0 OK
* func_808C28CC OK
* func_808C2B1C OK
* func_808C2BD0 OK
* func_808C2C38 OK
* func_808C2CB4 OK
* func_808C2CF0 OK
* func_808C2D78 OK
* EnBb_Draw OK
* func_808C32EC OK
* func_808C3324 OK
* Migrate data to C
* Use generated reloc
* Object symbols and misc cleanup
* Name struct vars that are used with Actor_DrawDamageEffects
* Name most things in the object
* Name attackRange
* Good enough names for limbs for now
* Might as well name the limb draw stuff for now
* Name flame width/height
* Enum for damage effects
* Name some more stuff from OoT
* Name a lot more stuff
* First pass names on all functions
* Name jinxTimer on gSaveContext
* Name sLimbIndexToLimbPos
* First pass name to the rest of the limb draw system
* More cleanup
* Last cleanup before PR
* Incorporate Actor_DrawDamageEffect stuff
* Respond to hensldm's review
* matched one function
* More matches
* more matches
* cleaning up some stuff
* making some progress
* two new matches, and a partial match
* meh...i'll come back to this
* fixing ctx names
* more matches
* OK and documented
* fixing data stuff
* PR suggestions
* fixing name and DL issues
* fixing pr suggestions
* PR feedback
* ....format....
* PR fix
* fixes
* dang format
* fixing name
* I'm blind
* fixing obj_grass
* Cleanup some shopkeepers
* More cleanup
* Document animations
* General cleanup
* Animation enums
* Limb maxes
* More Cleanup
* Some more minor stuff
* fsn cutscene state
* Parens and postlimbdraw
* Ossan Limbs
* Remove ENFSN_LIMB_MAX
* SI_MAX
* Compound macro
* Document gameplayKeep textures used by shopkeepers
* Ani Limbs in Ossan
* Format
* PR suggestion
* Remove trueTmp from EnFsn
* EnBomChu_Init OK
* EnBomChu_Destroy OK
* func_808F7868 OK
* func_808F79D4 OK
* func_808F7E74 OK
* func_808F7FA0 OK
* func_808F77E4 OK
* func_808F75D0 OK
* func_808F7944 OK
* func_808F7A84 OK
* func_808F818C OK
* func_808F8080 OK
* func_808F7FD0 OK
* EnBomChu_Update OK
* EnBomChu_Draw OK
* Drop unnecessary cast in Update
* Import data into C
* Object symbol
* Use generated reloc
* Port over OoT struct var names
* Name all statics
* Misc cleanup
* Name some of the new struct vars introduced in MM
* Port over most OoT function names
* Name movingSpeed based on in-game observation
* Name final param in EnBomChu_SpawnRipplesAndSplashes
* More cleanup and OOT port
* Some more names
* More docs
* Name last function
* Final little cleanup
* First round of review fixes
* Change the name of that one function
* More precise comment
* 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
* Building on Macs
* Add Mac building documentation
* Review
* Update for new z64compress
* Review
* getting some matching done
* gettting some more matches
* actor fixer
* almost OK
* Shn OK
* fixing data and warnings
* finishing touches
* forgot to update spec
* dang comments not being formatted
* this should fix things
* fixing feedback and other fixes
* fixing things
* fixing things
* addressing PR
* format and minor fix
* actorfixer
* fixing actor
* fixing enum
* yay format
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* 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>
* 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
* Fix existing documentation
* Fill out object_decomp.md
* First part of object decomp example
* Document animations
* Tutorial for identifying blob
* Naming everything else referenced in the actor
* Name all limb display lists
* Finish example
* Some tips and tricks
* Remove TODO
* Make merging.md consistent with everything else
* Name limbs properly
* Rename "bouncing idle" to "walk", since they use that animation to walk towards you if they catch you
* Run formatter again
* Purge hylian toolbox
* Be a bit more precise about vertex naming
* Also -> Further
* Correct description of how extract_assets works
* Format types of data
* Add note about palette
* Update text about object's C file
* Fix typo
* one more time -> in more detail
* Format render error as code
* explain what texture animations are
* Standardize on bullet points
* Use anon's sugestion for the "How we work with objects" section
* Trailing commas for better formatting
* Delete undefined_syms reference in object decomp
* Add note about root limbs
* Remove undefined_syms reference in object_decomp_example
* Remove "since"
* Explain *how* I changed the texture
* Explain what to do if the limb doesn't render anything
* Fix some extremely tiny incorrect enum name thing
* Explain the object symbol stuff bettter
* Add link to ZAPD documentation
* Also update documentation
* Update actor flags for Dns
* Import data to C
* BgNumaHana_Init OK
* BgNumaHana_Destroy OK
* BgNumaHana_Update OK
* func_80A1A500 OK
* func_80A1AE08 and func_80A1AE1C OK
* func_80A1AA14 and func_80A1AA28 OK
* func_80A1AA38 and func_80A1AA4C OK
* A few more functions
* Finish most functions
* func_80A1A56C OK
* BgNumaHana_Draw OK
* Use generated reloc
* Use object symbols
* Actor flags
* Minor cleanup
* Some initial documentation
* More documentation
* Document flower petal struct
* Some more struct vars
* Name everything else
* Finish documenting the object for the flower
* Final doc pass
* UNK_TYPE
* Respond to review and fix build
* z_obj_kinoko OK
* fixing DL and changing to thisx
* naming display list
* minor fix
* fixing PR suggestions
* addressing PR
* reverting name and leaving a comment
* Document object_rd + use it in rd and railgibud
* Move limb enum to rd.h, share it across all redead actors
* Copy over head/body rotation and effect documentation from Talk_Gibud to the other two
* Minor spacing things in Talk_Gibud
* Import tons of symbols from Talk_Gibud into Railgibud
* Always set actionFunc last in Setup functions
* Document the isInvincible struct var (thanks kz)
* More railgibud struct documentation
* Cutscene-related struct names
* Damage effect enum for Railgibud
* Damage effect enum for Rd
* Use the UpdateDamage name that everyone else uses
* Grab/Type enums in Railgibud
* Document EnRailgibud_MoveGrabbedPlayerAwayFromWall
* Document EnRailgibud_PlayerInRangeWithCorrectState
* Document EnRailgibud_PlayerOutOfRange
* Document path stuff in Railgibud
* More Railgibud junk
* Enum for animations
* Minor documentation on effect stuff
* Document Railgibud sink into ground
* Document most of Railgibud that was left
* Clarify one function name
* Use player2, since I guess func_800B8E58 takes Player* now
* Make Talk_Gibud/Railgibud consistent with each other in style
* Name a few Rd functions
* Name some dancing functions
* Make define for is Redead
* Define for if the Redead is frozen
* Make most params access use TYPE
* Document some Rd types
* Document grab fail functions
* Port a few more names from other Gibdo actors
* More Rd documentation
* Document alpha
* Document walk to home functions
* Document deathTimer in Rd
* Some more timers documented
* Document damageEffect struct var
* Name all functions in Rd
* Document unk_3E4
* Document grab stuff
* Document mourning state
* Document action states
* Name all remaining variables
* Document remaining EnRdType
* Document all types of Redead
* Use ACTOR_FLAGs
* Verbose player stateflags
* CheckCollision -> UpdateCollision
* Try to explain what makes Rd different from the others better
* Last changes before PR
* Move the limb enum to the object
* Remove unnecessary includes from the .c files
* Format after sync
* EnAni:Start
* EnAni: done with matching
* EnAni: docs
* EnAni: forgot the display lists, they wouldnt load in z64utils, had to use limb->DL to name them
* EnAni: forgot the spec, so rusty
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* EnAni: more requested changes
* EnAni: format pass
* EnAni: remove typedef warning
* EnAni: typdef attempt
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnAni: changed ani state flags from enum to defines
* EnAni: formatter no
* EnAni: undefined behavior
* EnAni: chest rot discovered
* EnAni: fixes after merging
* EnAni: flags docs
* EnAni: flags at top using enum
* EnAni: jenkins bait
* EnAni: revert bgcheck flag
* EnAni: single doc
* EnOssan: format after fix to EnAni
* EnAni: requested changes, some documentation changes
* EnAni: forgot to re-extract
* EnAni: better object naming
* EnAni: changed STATE_SUFFERING to STATE_WRITHING to match object docs, removed extra whitespace from defines
* EnAni: removed object comment about z64util not rendering them
* EnAni: flipped actor flag to match OOT
* EnAni: formater pls
* EnAni: Animatation Enum values in Animation_change calls
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnYb: start
* EnYb: ah I broke it
* EnYb: well at least the draw function matched...
* EnYb: back to semi-matching
* EnYb: Back to OK, workable again
* EnYb: init matches now, ugly as it is for dma padding
* EnYb: probably not progress
* EnYb: fixes to master merge, back to OK
* EnYb: custom shadow function matches
* EnYb: more docs, this last function sucks
* EnYb: OK thanks to Anon and myxrules
* EnYb: docs
* EnYb: more docs
* EnYb: formatter pass
* EnYb: removed unused symbols
* Requested changes part 1
* EnYb: Minor changes
* EnYb: forgot the spec
* EnYb: some display lists documented based on limbs, but two remain because their limbs dont highlight in z64Utils
* EnYb:one wrong entry
* EnYb: maybe better object documentation
* EnYb: fix warnings
* EnYb: flag docs
* EnYb: changed function
* EnYb: more documentation
* EnYb: flags enum at top
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* EnYb: PR fixes
* EnYb: formater is picky
* EnYb: jenkins bait
* EnYb: correct array access
* EnYb: formater pass
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* EnYb: fixes
* EnYb: more requested changes, formater pass
* EnYb: renamed padding
* EnYb: object xml name updates
* EnYb: merge fix
* EnYb: limb enum and small changes
* EnYb: scale float fraction found
* EnYb: better object limb naming
* EnYb: formater pls
* EnYb: flipped actor flags to match OOT
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* EnYb: more requested changes
* EnYb: more animMode enum found
* EnYb: doc player playing ocarina
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Migrate data to C
* Init / Destroy / Update / Draw
* Functions called from Update
* Better Init match
* A few more functions
* A few more functions
* Drum-spawning function OK
* EnJg OK
* Name a few struct vars
* Name some static vars
* Name limbs
* Name limb DLs
* Name some textures
* Name all remaining textures
* First pass animation names + use object in actor file
* Add drum to XML + clean it up
* Better translations, thanks Emily!
* Some more documentation
* Improvements
* Params accessor for s_goro
* Proper object symbols for Jg_Gakki
* Delete unnecessary undefined_syms
* Text defines for my own sanity
* Some more names
* Document point/path stuff
* Name every function, even if the names are bad
* Params macro for if he's in goron shrine
* Some misc improvements
* Document EnJg_GetShrineGoronToFocusOn better
* Final cleanup before PR
* Change action name because this actor is dumb!
* Run actorfixer
* Rename some variables now that a function is named
* ProcessTalkRequest takes GameState
* Run actorfixer
* Use new actor flags
* Update text ID names to match my text ID PR
* Define the limb enum in the object
* Be consistent about where the EnumName is
* Don't name limbs after the actor
* Basic enum for drum limb
* Fix stuff after merge
* Do if/else if/else
* Remove textId defines
* Decimal weekEventReg accesses
* en_am ok
* clean up
* applying feedback and some docs, need finish still
* this should fix things
* fixing things
* fixing things and running format
* post actor_fixer
* adding object header and fixing comments
* formatting and adding enum for limbs
* addressing pr, naming things, cleanup
* fixing enum in header
* doing some docs and fixing format
* EnDemoheishi decomp first pass
* object decomp
* whitespace between declarations and statements added
* various PR fixes
* format for CI
* various PR fixes 2 + format
* missed one texture output name
* fix texture docs in unrelated files
* fix demoheishi shared texture naming
* made object sdn properties generic for soldiers
* missed outName modifications
* fixed references to updated function names
* reverting some texture changes to unrelated objects & use object specific names for lips and fingers textures
* added textId comment
* various PR comments addressed
* added enum for animations
* reverting halt animation naming
* moved animation enum to actor class
* fixed enum names
* fix typo
* more PR fixes
* format
* fix for broken build after other PR merge
* format
* merge fixes
* isTalking
* Enum - Calf to shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Object - Calf to shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* DList - Calf to Shin
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Match remaining functions of code_8012EC80.c
* parameter_static extracted and OK
* Small Progress
* Documentation all over the place
* Finish Documenting
* Cleanup
* Name more textures
* Update knowledge on deku playground player name
* All textures from parameter_static known now
* Finish documenting and validating parameter_static
* More up-to-date SaveContext docs
* More docs
* More cleanup
* Sun -> Star
* Minor touchup
* More cleanup
* pictograph -> pictoBox
* Remove the "unused" part
* More accurate name: hour lines
* It's gsDPLoadTextureBlock, not gsDPSetTextureImage
* Fix parameter_static and merge issues
* More docs from new PRs and Parameter WIP
* Missed a name
* Move parameter_static to interface assets
* Clean up code_8012EC80.c data
* Fix comment
* Add comments to parameter_static
* Oops
* fix merge
* Missed a PR review suggestion
* Fix merge
* EnZo OK, sort of documented
* fix variable naming
* fix suspicious match, add -ing to `PlayWalkSound`
* name `FollowPath`, waypoint struct member
* update description to say unused
* name `TreadWater`, fix a snake case i missed
* name `Walk`
* cleanup a bit
* address comments
pointers -> symbols, remove static and array length, inline data,
define var on same line, update file description, use ARRAY_COUNT
* space things out, move data, add ENZO_NO_PATH
* fix ENZO_NO_PATH define
* remove array pad, dec for size, thisx in limbdraw, renames in draw
* name some object_zo stuff, use symbols
* funny single member damage enum
* name textures
* name the rest of the used items in object_zo
* name the dlist
* suggestions
* actually fix the return false
* formatting
* Document the boulder fragments in gameplay_keep and clean up En_Baguo
* Remove the boulder fragment from variables.h
* Run ./format.sh
* Move limb enum to object
* Document object_obj_tokeidai XML
* Change "outer ring" to "minute ring" to better describe what it is
* Rename "sun and moon disk" to "sun and moon panel"
* Preserve ordering
* Standardize on "staircase to rooftop"
* Standardize on calling it "Exterior Gear" to contrast with all the interior stuff
* Lots more documentation
* Make it more obvious that the macros refer to clock time, not regular time
* More documentation and spacing
* Better document counterweight draw
* Respond to Anghelo's and engineer's reviews
* Split tokeidai into separate files
* Revert "Split tokeidai into separate files"
This reverts commit eed1fe5ff6.
* Document lodmoon
* Document moonston
* Document the open-mouth moon part of fall2
* Document object_fall
* Move flags to .c
* palette -> tlut
* File header comment
* OPEN_DISPS/CLOSE_DISPS spacing
* Lots more spacing
* Add spaces after breaks
* Better describe the subtypes
* More fixes
* Be a little more specific in fireball comments
* Respond to Elliptic's second review
* I need to stop forgetting to run ./format.sh
* Single line comment styling
* Preserve ordering
* EnBigokuta like half matched
* match all but 2 functions
* match all the functions
* import data
* name object stuff
* use new object symbols, do some documenting
* fix name of headUndersideTex
* name some struct members
* finish documenting
* Address comments
spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum
* address comments
* move empty line
* change the ARRAY_COUNT
* scene texture xml generator
* Create XMLs for every scene_texture except 3 and 7
* Manually add blobs
* add XMLs for not used ones
* update spec
* Add scene_texture as external files to every scene that uses them
* add gsDPLoadTextureBlock_4b
* gsDPLoadMultiBlock
* gsDPLoadTLUT_pal16
* gsDPLoadMultiBlock_4b
* Add back the blob I removed...
* address review
* Fix tluts
* delete script
* First
* Part2
* Save now or forever hold your peace
* Part3
* Building
* OK
* Cleanup
* Merge
* PR
* PR
* Merge
* PR
* PR
* Use oyu
* Use names
* TexturePtr
* Name textures in object_mag
* Corrections
* tabs -> spaces
* OK, data imported
* Remove obsolete comment
* Start documentation
* Defines for most texture sizes
* Name most static variables, add state enum
* Macros, name all the statics
* Couple of minor tweaks to other files
* Name some more effect stuff
* Fix kanfont data
* Name everything else, move macros
* Format
* Review
* Match Player_GetHeight
* Another bunch
* Fix merge conflict
* rename Gfx_DrawDListXlu
* add WEEROR
* Actor_Spawn
* almost Actor_SpawnTransitionActors and Actor_Delete
* A bunch of small actors
* More renames
* format
* Some Player renames
* a few more
* import data
* run formatter
* func_800B7170
* whoops
* Fix merge issues
* Whoops 2
* func_800B83BC and func_800B83F8
* Actor_IsActorFacingPlayerAndWithinRange
* add some prototypes
* match Actor_UpdateBgCheckInfo
* func_800B7678
* mark Actor_SpawnAsChildAndCutscene as non_matching
* Actor_Draw
* Update is chaotic
* 2 new matches
* func_800BC8B8
* Another bunch
* function renames
* run formatter
* cleanup
* remove unnecesary casts
* add missing sfx
* Fix renames
* fix merge
* func_800BF7CC
* small bunch
* another bunch
* func_800BE184 non_matching
* two more
* split z_cheap_proc
* Another bunch
* another bunch
* a few and a non matching
* yeee
* a
* Actor_DrawAll non_equivalent
* Actor_RecordUndrawnActor
* i don't know what to put in this commit message
* func_800B4B50 non matching
* func_800B42F8 non matching
* func_800B5040
* func_800B5814 non_equiv
* func_800B6584
* func_800B6608
* func_800B6680
* func_800B7E04
* func_800B8118
* func_800b9170
* ,
* func_800BC4EC
* func_800BA6FC
* func_800BA798
* func_800BA8B8
* Actor_LoadOverlay
* small cleanup
* func_800BB2D0
* meh
* func_800BBAC0
* func_800BC270
* func_800B5208 non matching
* Fix warnings
* meh
* rename some ActorShadow_ functions
* fairy
* Flags_
* fix warnings
* format
* Actor_PickUp and family
* func_800B8E58
* match Actor_RemoveFromCategory
* another bit of docs
* Match func_800B86C8
* And another bit
* rename Player_GetRunSpeedLimit
* func_800B9E84
* func_800BE63C
* func_800BB8EC
* match func_800B5814
* match func_800B9334
* cleanup
* fix conflicts: first pass
* another fix
* actorfixer fix
* fix conflicts
* func_800BE680 non_equivalent
* Improve func_800BE680 a bit
* func_800BE680 equivalent (?)
* func_800BE680 equivalent
* Actor_UpdateActor equivalent
* format
* use some ExchangeItemID enum values
* Some more cleaning
* more cleanup
* More name stealing from OoT
* match func_800B82EC
* match func_800B9D1C and a bit of cleanup
* Add ACTOR_FLAGS placeholders
* Renames and match func_800BE184
* last pass of name stealing
* format
* fix conflicts
* more cleanup
* more cleanup
* cleanup and OVERLAY_RELOCATION_OFFSET macro
* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s
* remove newlines
* minor rename
* Use ACTOR_FLAGS in z_actor
* Match func_800BE3D0
* Rename movement functions
* Document Actor_CalcOffsetOrientedToDrawRotation
* velX -> horizontalSpeed
* A bit of documentation for actor movement functions
* format
* Fix merge issues
* format
* Format
* Fix renames
* fix warnings
* fix conflicts
* review :D
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Fix
* format
* Actor_SpawnSetupActors
* engineer review
* Update src/code/z_actor.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* A bunch of Engineer's reviews
* more Engineer's review
* a
* whoops
* run actorfixer
* c'mon
* 😮💨
* whoops
* warning
* More engineer's review
* run format
* I'm dumb
* a
* match func_800BE680
* Match Actor_DrawZTarget
* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor
* Fix merge issue
* format
* update actor
* Steal a bit of @Thar0 documentation from OoT's z_message
* Run actorfixer
* Fix renames
* Match func_800B4B50 thanks to @hensldm
* Improve ActorShadow_DrawFeet thanks to @hensldm
* whoops
* Actor_PlaySfxAtProjectedPos
* Actor_UpdateActor matched by @hensldm
* Match func_800BA2FC by @hensldm
* Match Actor_SpawnTransitionActors by @hensldm
* Match func_800BB604 by @hensldm
* Match Actor_DrawAll by @hensldm
* ActorShadow_DrawFeet by @hensldm
* Actor_UpdateAll by @hensldm
* Match func_800BCCDC by @engineer124
* Small Actor_PlaySfxAtPos by @engineer124
* ACTOR_FLAGS_ALL and a bit of cleanup
* Add invisible comment
* Small docs pass
* Fix merge
* Engineer's review
* format lol
* Actor_DrawDoorLock docs
* Actor_SpawnShieldParticlesMetal
* fix merge issues
* sActorFaultClient
* fix
* commit message
* Run actorfixer.py && format.sh
* Fix warnings
* fixes
* format
* bss
* Update include/functions.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Address review
* Fix merge issues, format and such
* fix merge issues
* Add ACTORCAT_MAX
* actorList -> actorLists
* Fix merge issues
* format
* Enable WERROR on jenkinsfile
* Fix merge
* Use object symbols
* address review
* format
* review
* fix merge issues
* fix
* VRAM_PTR_SIZE, small cleanup and format
* review
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Parker Burnett