* import camera data
* cleanup
* easier-to-read cam-hud-visibility
* PR Suggestions
* fix camflag macros
* fix bss
* camera data summary
* small cleanup
* cleanup camera data
* cam data mode enums
* 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.
* Started ovl_Bg_Kin2_Picture. _Draw, _Destroy and _Update matching. Started _Init.
* Switching branch.
* 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.
* About 8 extra functions matching for ovl_Bg_Kin2_Picture. _Init and 3 other functions to match.
* Only two functions left to match in ovl_Bg_Kin2_Picture.
* func_80B6F098 in ovl_Bg_Kin2_Picture is matching. Adding co-authors.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
* ovl_Bg_Kin2_Picture OK. Documentation for the overlay and the associated object next.
* Fixed reloc file in spec for ovl_Bg_Kin2_Picture.
* Fixed reloc file in spec for ovl_Bg_Kin2_Picture.
* Started ovl_Bg_Kin2_Picture clean up. Named extra assets in object_kin2_obj. Rewrote func_80B6EFEC. Adding documentation co-authors.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
* Removed some temps from functions, renamed some functions and some variables in ovl_Bg_Kin2_Picture.
* More cleanups. Starting to make sense of what is happening in ovl_Bg_Kin2_Picture.
* Renamed the spawn function for Gold Skulltulas and a timer variable in ovl_Bg_Kin2_Picture.
* Renamed fall and shiver functions plus their respective setup functions for ovl_Bg_Kin2_Picture. Renamed some variables in the same actor.
* Renamed all functions in ovl_Bg_Kin2_Picture. Need to confirm name for painting timer used for two distinct reasons.
* Renamed a struct variable and rewrote some comments for ovl_Bg_Kin2_Picture.
* Renamed all struct variables in ovl_Bg_Kin2_Picture except padding.
* Renamed static variable, dust spawn function and a variable in the dust spawn function for ovl_Bg_Kin2_Picture.
* Finished decompiling object_kin2_obj. Adding extra co-authors.
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Ready to make PR branch.
* Fixed merge conflicts. OK.
* Fixed object_kin2_obj.xml error.
* Applied first batch of fixes from PR review to z_bg_kin2_picture.c and its corresponding header.
* Fixed unused TLUT naming in object_kin2_obj.xml and added a description to the object.
* Removed extra parentheses in z_bg_kin2_picture.c and renamed a macro.
* First batch of fixes suggested by EllipticEllipsis for ovl_Bg_Kin2_Picture.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Second batch of fixes suggested by EllipticEllipsis for ovl_Bg_Kin2_Picture.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Rewrote 0xCCC as 0x10000/20.
* Renamed angle and offset variables in BgKin2Picture_SpawnDust.
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>
* progress
* progress
* about to merge data. probably a bad idea
* matches with ZAPD
* docs
* done for now
* progress
* about to merge data. probably a bad idea
* matches with ZAPD
* docs
* done for now
* Fix makefile and add non matching to spec
* did some git stuff
* Git being a problem as usual
* format
* PR fixes
* PR fixes
* PR fixes
* Merge master and fixes
* going to merge play
* merged in the big one
* docs
* PR fixes
* format
* Clean up
* transition
* Better init
* Glitchy animations
* PR
* Format
* PR comments
* Missed one
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* fix conflicts
* Fix conflicts
* format
* PR
Co-authored-by: louist103 <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* some progress, nasty draw func only thing to do
* pushing for engineer
* matching with no warnings
* fixes
* minor names
* PR feedback
* fixes for PR
* docs
* PR comments
* fixing format and found bit shift
* OK
* Some docs and cleanup
* flags -> params
* Remove todo
* Small cleanup
* Description and dls
* Format
* bug tag
* Update bug comment
* Update src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Format
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Good start
* Limb draw stuff OK
* A ton more functions
* func_80A477E8 OK
* func_80A456A0 OK
* func_80A460A4 OK
* func_80A46990 OK
* func_80A46414 OK
* EnWiz_Update OK
* func_80A45CD8 OK
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
* EnWiz_Draw OK
* Use generated reloc and object symbols
* Document object stuff related to Wizzrobe itself
* Some more names
* A bunch more names
* Name even more stuff (sensing a pattern?)
* Document damage tables and damage effects
* Bunch of stuff mostly related to ghosts
* Name all struct vars and functions
* Fix WizFire build issue
* Split up dmgFlags
* Apparently it's spelled "Wizrobe" in this game
* Name all assets EXCEPT the ones used by wiz_fire
* Apparently, the blob is vertices
* Name all remaining variables
* Some function comments
* (Probably) the final touches on EnWiz docs before PR
* Name a ton of stuff in EnWizFire
* Finish naming everything in EnWizFire
* Finish documentation
* Respond to Engineer's clean-up review
* Respond to Anghelo's first review
* Use TATL_HINT_ID enum
* Enum comments for animations, and better names for some damage effects
* Fix build after merging master
* Respond to Elliptic's review
* Define INITIAL_CUR_PLATFORM_INDEX
* Drop _CUR_ from the name
* Rename one of the enum values
* Respond to Elliptic's WizFire review
* Every switch has a default
* EnTg_Init matches
* Destroy matches
* Cleanup header, add commented out functions
* EnTg_Update matches
* Match another function
* Working on func_8098FEA8
* Almost match function, format
* Match func_8098FEA8
* Match func_8098F8A8
* EnTg_Draw matches
* Match func_8099000C
* Match func_8098FBB4, almost got func_8098FBD0?
* Match func_8098FBD0
* Match func_8098F800
* Working on func_8098FA70
* figured out one other block, at least
* A little closer
* Match func_8098FA70 with help from discord yay
* Match func_8098FD50
* Add extern data i missed
* Prep for data
* Replace data from objects_mu.h
* Add data
* Remove comments'
* Rename two draw functions
* Run format.sh
* Fix space
* Rename global static variables
* Renamings to match master
* Undo some renamings to get diff
* Name variables in func_8098F800
* Rename EnTg_ChangeAnimation
* Rename UpdateCollider
* Add comments for me
* More renaming
* Renaming
* Lots of renaming struct vars
* Rename heartStartPos
* Rename EnTgHeartInfo
* Rename heart stuff
* Cleanup comments
* Comment cleanup
* Rename functions
* Remove commeneted out bit of spec
* Naming things in object_mu
* Name animations
* Name dlists
* Name textures
* Finish naming textures
* Comments
* Format
* Fix name from merging
* Revert rename_sym mac changes
* Cleanup and remove static data
* cleanup comments
* Whoops, fix spec file
* Rename heart DLs
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Fixing renamed things
* Format
* Fix struct
* Standardize Effect struct naming
* More renaming and cleanup
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Format
* Rename gEffHeartText
* Format
* Rename LowerArm -> Forearm
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Rename enTgHeartEffect -> effects
* Cleanup structs
* Rename gDropRecoveryHeartTex
* Rename individual EnTgHeartEffect as effect singular, rename len to numEffects
* Rename heartVelocityVec -> heartVelocity and flag -> isMaterialApplied
* Remove struct address leading zeros, use UNK_TYPE1 type
* Rename EnTg_DrawHeart -> EnTg_DrawHearts
* Replace unused variable with pad
* Remove extra header, make sAnimationInfo a list
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Done-ish, looking for feedback.
* Finished decompile and rename of ovl_En_Nimotsu (Bomb shop bag)
* Revert unk->pad rename, leaving as unknown.
* Swap the reloc include to the src version
* Style/type updates from review comments
* Changes from review:
- Remove extra whitespace
- Remove unnecessary include
- Hex->Dec for alpha value.
* Changes from review, Texture name and comment formatting
* More changes from review, whitespace and dustTimer->timer rename.
* EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented
* Type macro
* Limb enum for sJntSphElementsInit
* Respond to hensldm's review
* Use TATL_HINT_ID enum
* Respond to reviews
* Increase size of shadowBodyPartsPos to 24
* Change 14 to a define
* stuff
* Renaming in-process
- Changed action names and setup names based on examples.
- Undid some ill-advised changes that broke matching.
- Misc variable naming. Need verification and not all complete.
* wip renaming
* A bit more progress on determining names for everything.
* Done with naming.
* Touchup before review
* Updates from review:
- Leave displacementY/unk_AC0 naming to z_actor work.
- Remove unnecessary include of z64math.h, indirect inclusion preferred
- Add trailing comma for better formatting of sDisplayLists
- Rename of static vectors sNullVec3f->sZeroVec, sUnitVectorX->sUnitVecX
- Restore pad instead of using local const. Change const to #define
- Prefer index over idx
- Remove 'b' prefix from bHasNewRootCornerPos
- Const -> Enum and formatting in ObjKendoKanban_IsPlayerOnTop
- Rename 'Aerial' to 'Tumble'
* Missed items in review:
- Missed an instance of displacementY->unk_AC0 renaming (Cause of build failure)
- Whitespace formatting
- UNK_TYPE2 undo
* More adjustments from review:
- Undo accidental formatting changes to z64player.h, restoring to master.
- Naming and Formatting changes.
- Removing some comments.
* From review, qualify enum and #define with obj name, whitespace cleanup.
* leave it to beavers
* match
* merge
* catchup part 2
* fix warnings
* I accidentally the xml
* hopefully that's all of them
* lol merge
* linked object
* now with more enums
* Update src/overlays/actors/ovl_En_Az/z_en_az.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* more fixes
* limbs and maths
* stuff
* more macro management
* last enum?
* more fixes
* fixed
* entrances
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
chloe!!