* initial commit object_hana documentation
* explain how object is organized
* change whole flower set name
* a litle space
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* initial commit of object_tsubo, object_racetsubo and object_obj_chan documentation
* little description in chandelier xml
* desc between root and file
* changed green pot to race pot
* changed race pot to magic pot
* space in desc
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* initial commit of object_dinofos documentation
* forgot to format
* dinolfoslimb
* eye texturs
* desc position and eye tex name change
* forgor the rest
* removed object .h from .c #includes
* Add original asset names to all `object_h*` files
* Soften language used in `object_hunsui`, because we can't say for sure that we know the names of the collision files, even if it feels pretty clear
* Switch from "is" to "might be" on the DLs too
* Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena)
* Respond to engineer's review
* Updated the type names, used "ruin" instead of "prop" in comments, and addressed Anon's review
* Missed this instance of "prop"
* Respond to engineer's review
* Update OutNames too
* WIP
* map static
* finish english names
* jpn
* revert map name
* name prefix
* boss to big
* more comments
* item enums
* more items
* more
* PR Suggestions
* PR Suggestion
* Change `EN_SYATEKI_*` enums/defines to `SG_*`
* Name shooting gallery weekeventregs
* Get rid of names on unions (this is what I wanted to begin with!)
* Use ARRAY_COUNT(sGuayFlagsPerWave) instead of 3
* Actually give a proper name for SG_DEKU_GET_PARAM_FF00
* Use anon's suggestion for path param name
* Remove comment that isn't true? What was I cooking back then
* Animation naming stuff + comments
* Tons of score and shooting game logic cleanup
* Fix build issues
* Some more Octorok docs
* Use ANIMMODE enum in EnShn
* Put a bug tag on the weird behavior in EnSyatekiWf
* object_firefly dLists and skel
* most limbs, textures
* more limbs, comments, outnames.
* fixed d list name in z_en_firefly
* enum name fix, limbIndex numbers fix, root name fix
* llvm changes because of format.py
* deleted llvms and max limbs number fixed
* z_en_firefly changes after clang format
* error in the build because of these two
* fixed limbIndex issue and added enum names instead
* equal sign that was missing
* limbIndex number was wrong
* z_en_firefly.h include changes and morph/joint table changes
* build retry
* format.py again and build retry
* Initial docs
* Tons of stuff done
* Fix spacing thing now that the function is actually named
* Temporarily add un-macro'd flags as comment
* Name and document EnSyatekiOkuta_IsHiddenByAnotherOctorok
* Finish naming all functions
* Better macros + explanations
* Comments on a lot of functions
* Some stuff I was supposed to revert
* Fix merge issue
* Another merge fix
* Make data static + move it in-function
* Respond to engineer's review
* circleOrCrossAlpha -> hitResultAlpha
* Respond to more of engineer's feedback
* octorokHitType -> lastHitOctorokType
* Animation enum stuff
* Start
* Try every function
* Import data
* Docs from message branch
* Fix non-equivalency for func_8016AE1C
* Everything looks NON_MATCHING
* Some more clean up and docs
* Some cleanup
* Small format
* Small improvements here and there
* Match a couple
* Anotha one
* and than there was 1
* and than there were none :)
* Lots of docs
* Finish code docs
* schedule static
* Macros + cleanup
* text ids array cleanup
* Entries cleanup
* Use sBombersNotebookEntries in macros
* Some docs from message branch
* eventIndex -> event
* Remove outdated comments
* PR
* BOMBERS_NOTEBOOK_ENTRY_SIZE
* tables
* Token pasting to simplify
* Some more fixes
* PR pt 1
* Format
* Bring over BombersNotebook docs from z_message branch
Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
* Full enum glory
* Format
* Name weekeventregs
* typo
* Some comments
* bss
* Review
* bss
* Update src/code/z_play_hireso.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Fix
* Namefixer
* bss
* Format
* 0 = 0x0000
---------
Co-authored-by: ZoeyZolotova <zoey.zolotova@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Everything below Main OK,
and some small ones at the top
* 3 more short ones
* FileChoose_Main
* SelectModeUpdate/Draw
* SelectMode update functions done
* 2 more small ones
* ConfigModeDraw
* SetWindowVtx
* FileChoose_FadeInMenuElements
* Rest of the Config Mode Update Functions
* Minor cleanup
* FileChoose_UpdateMainMenu
* Make xml for title_static
* Minor correction
* One nasty draw, thanks Synray
Co-Authored-By: Synray <31429825+Synray@users.noreply.github.com>
* import data
* some cleanup
* import OoT docs
* missed some docs
* some progress
* FileSelect_SetWindowContentVtx WIP
* improve FileSelect_SetWindowContentVtx
* match z_file_nameset_NES
* cleanup and docs
* title static
* a few more functions
* even more functions
* small cleanup
* Data Cleanup
* 2 more matches
* z_file_choose_80807940 OK
* cleanup
* fix merge master
* FileSelect_DrawFileInfo wip
* small cleanup
* minor
* fix merge
* match FileSelect_DrawFileInfo
* cleanup
* fix merge
* fix merge
* sram cleanup
* document select mode
* many docs
* more docs
* more cleanup
* small nitpick
* consistency
* more cleanup
* more cleanup
* small
* small typos
* octal bad
* pr review
* noop
* elliptic review
* more review
* non-matching
* oops
* more suggestions
* keyboard formatting
* fix master
* sound
* padding
---------
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Match remaining functions in z_en_go:
- Changed some already matching functions for uniformity with the tricky match (early continue from loop). In some cases, this eliminated some strange constructs, in others, it didn't leave much difference.
- Comments/Notes to start understanding/naming process.
* WIP renaming
* More WIP renaming.
* More renaming, Effects (See oot for continuation) and some flags)
* MessageScript documenting.
* Util for dumping message data by textId value.
* Identify some messages.
* Formatting, figuring out event flags.
* More WIP naming
* WIP renaming.
* WIP renaming
* WIP naming and organizing
* WIP more renaming.
* WIP renaming/organizing.
* Near-Final Cleanup before review.
* Rename Taisou and Hakugin animations and associated functions/variables.
* Misc Cleanup.
* Undo changes to variables.txt
* Removed msgtableparser.py (Split to another branch)
* Removal of uncompiled Message Script details.
* Fixup spec file
* First part of hensldm's suggested changes from review. Awaiting discussion.
* Second part of hensldm's suggested changes.
* Fixup missed 'Animation' suffix and functions.txt
* Update .xml files and related source per tom-overton's comments
* Align w/ engineer124's Quake Cleanup #1102
* fixup
* Run format.sh after merge.
* Add brackets around one-line conditional blocks
* Remainder of hensldm's comments from review.
* First pass at Elliptic's comments.
* Rename functions UpdateToX -> ChangeToX
* Header cleanup.
* Run Format, remove accidental commit of .orig file.
* Fixup ActorInit
* Review comments addressed, plus a few unsolicited changes.
- Location of function declarations moved above static data, below types: References in the codebase were mixed, but this just made more sense.
- Function name changes: It didn't fit into subsystems based on Goron Type, so I quit trying to name functions that way. Loss of a bit of "which function applies to which type", but it looks a bit cleaner, sooo...
- Took a stab at making effectTable usage a bit clearer. Just using a EnGoEffect* everywhere and not inherently knowing if it was for one element, or an array really bugged me.
- "GraveBro" names changed. They're all "brothers".
* Changes from engineer124's review.
- "Stretcher" replaced with "Athletic" as a descriptor of goron type.
- Misc formatting and naming changes
* Restructure switch-case statment for early break, and added missing default cases. Removed #define for 0 for actionFlags bitmask.
* Relocate WEEKEVENTREG comments, remove SCENE comments.
* Updated WEEKEVENTREG define names
* Update WEEKEVENTREG names in Goron Shrine Door.
* ELDER -> ELDERS, and revert formatting on z64save.h
* Fixed re-applying changes over wrong defines.
* Adjust Weekeventreg names and comments.
* Update comment as well.
* Progress
* one more
* OK
* update
* finished z_demo_moonend
* update reloc
* actually updated reloc
* fix symbols
* made suggested changes
* reformat
* Made suggested changes
* forgot to run format.py
* made suggested changes
* made suggested changes
* moved cueid to be in scope
* Begin Kaleido
* WIP
* DW macros for gbi
* More Progress
* Match KaleidoScope_GrayOutTextureRGBA32
* DrawGameOver wip
* Add some function names
* A few more matching, some docs
* More docs, data wip
* Import Kaleido Data
* Data cleanup
* Some progress
* Match TitleCard_Draw Again (Thanks Roman)
* Match KaleidoScope_DrawDebugEditor
* KaleidoScope_UpdateDebugEditor WIP
* Some cleanup
* z_kaleido_debug.c OK
* Cleanup
* match func_8081B6EC
* more wip, data cleanup
* match func_80825A50
* match KaleidoScope_InitVertices
* cursor progress
* name func
* item headers
* match KaleidoScope_DrawItemSelect
* KaleidoScope_UpdateItemEquip WIP
* match kaleido item
* doc kaleido item
* z_kaleido_prompt ok
* kaleido mask setup
* small cleanup
* kaleido mask OK
* mask cleanup
* small fix
* quest page setup
* doc save prompt
* sync with prompt docs
* KaleidoScope_Update WIP
* More progress on KaleidoScope_Update
* kaleido update cleanup
* KaleidoScope_Update OK
* Slightly cleaner match in KaleidoScope_Update
* match KaleidoScope_DrawPages and KaleidoScope_DrawGameOver, organize data
* more cleanup
* match KaleidoScope_Draw and KaleidoScope_SetView
* match KaleidoScope_UpdateNamePanel
* match another 2 funcs, segment docs
* another KaleidoScope_UpdateNamePanel ?
* swap update name panel names
* another match, only 2 large/similar vtx function in kaleido nes
* more setup for drawInfoPanel
* match KaleidoScope_DrawDungeonStrayFairyCount, 8 funcs left
* document KaleidoScope_DrawDungeonStrayFairyCount
* KaleidoScope_DrawInfoPanel1 WIP
* match KaleidoScope_DrawInfoPanel2
* gameover pause states
* name two pause states
* match KaleidoScope_UpdateDungeonCursor and KaleidoScope_UpdateWorldMapCursor
* match KaleidoScope_DrawDungeonMap
* KaleidoScope_DrawWorldMap WIP
* cleanup map
* some cursor/texture docs
* more cursor docs
* KaleidoScope_UpdateQuestCursor wip
* match KaleidoScope_UpdateQuestCursor
* quest cleanup
* KaleidoScope_DrawQuestStatus WIP, broke gakufu
* match KaleidoScope_DrawInfoPanel1, Kaleido NES OK
* pause substates
* more cleanup
* map progress
* very small improvements to KaleidoScope_DrawWorldMap
* match KaleidoScope_DrawWorldMap
* cleanup KaleidoScope_DrawWorldMap
* rematch EnGakufu_ProcessNotes, thanks anon58
* gameover and misc docs
* more docs
* small cleanup of maps
* owl warp and other docs
* symmetry in pause state
* some docs and cleanup
* docs
* more docs from OoT WIP
* fix
* quest page docs
* more enums
* more cleanup and enums
* another round of docs
* doc cursor indices
* map docs
* some docs
* cleanup for-loops
* cleanup
* else if
* small docs
* icon_item_field_static
* dungeon static
* eol
* icon item jpn static
* vtx static
* jpn static comments
* import parameter texture functions
* mask cleanup
* sync with PRs
* some docs
* more docs
* fix bss
* some docs
* sync with PR
* quest docs
* fix quest vtx
* sync with PR
* sync with PR
* fix typo
* small cleanup
* vtx madness
* more vtx
* add quad docs
* cleanup vtx
* cleanup
* cleanup
* revert gbi changes
* cleanup
* more cleanup
* another cleanup
* remove empty comment
* some PR review
* more naming suggestions
* namefixer
* L button to Z button
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Decompiled source of tobira01
* Documented and formatted in prep for merge request
* Added spacing, renamed unused back to what it was, added definitions, changed 1.6666 to division
* Ran weekeventreg script, added additional spaces throughout the file, removed the macros for 0 and 60, updated some missed this casts, renamed spot11 out names
* Converted gSaveContext calls over to CLEAR_WEEKEVENTREG calls from review feedback
* Reformatted some files
* More review feedback
* Removed _tex
* decomped init, draw
* started slime
* finished func decomp en_slime
* object_slime and en_slime updates
* updated a few names
* finished up some naming
* en_slime and object_slime OK and documented
* slime xml cleanup
* Code cleanup round 1
* Cleanup 1 - missed a note
* Fixed improper use of bgcheck flags
* Some cleanup
* Namefix, name cleanup
* Function name cleanup, misc cleanup
* More name cleanup (pre-merge)
* Update color filter flag constants
* Tidying
---------
Co-authored-by: Blythe Hospelhorn <35576053+bhospelhorn@users.noreply.github.com>
* OK, data imported
* Permuter settings
* Name data, a few functions and variables, cleanup
* Small amount of cleanup on some related actors
* Oops
* Document object
* Type and other macros
* Some cutscene stuff and temporary function names
* Proper path function names
* Name a couple more functions
* A couple more function names
* Name PathStatus enum
* Name rest of functions and formalise the documentation a bit
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* limbs
* Format
* Review
* format
* weekeventregconvert and format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* OK, struct documented
* Data imported, update spec
* Name data
* Name all functions and variables
* Document object
* Bit more documentation
* Document Karebaba
* Add note to object_dekubaba
* Bit more cleanup
* Review
* Shadow
* Review
* Rename functions, add hit enum
* Figured out the enum
* Review
* MarkForDeath -> Kill
* File split
* Split, OK and documented
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Document relevant parts of DmBal
* Some EnPaper docs
* Document EnPaper
* Name functions
* Defake Actor_UpdateActor a bit
* Reword
* \cdot
* Fiddle with the description of the DE again
* Actually force is probably more correct
* Probably time to stop fiddling
* Format?
* Review
* Remove bug comment
* Review
* Rename to su_mtx, split off code_80140CE0
* Format
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* 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>
* 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
* Document BgCraceMovebg (sliding doors in Deku Shrine) and object_crace_object
* Respond to Elliptic's review
* Fix build issue
* Respond to Elliptic's second review
* ACTUALLY put the BSS above the data, forgot the InitVars were data
* Respond to hensldm's review
* 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.
* Name all but one DList
* Name keyboard textures
* Finish object
* Respond to Elliptic's review
* Respond to Anghelo's review
* Comments for animations in array
* Respond to Engineer's review
* 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
* Document everything except the unknown blob and the weird collision
* Add the last unused texture, thanks Tharo!
* Finish up documentation
* Respond to Elliptic's review
* EnRat_Init and EnRat_Destroy OK
* Tons of actionFuncs and other stuff
* EnRat_Update OK
* func_80A566E0 OK and better match for func_80A56EB8
* All draw functions OK
* EnRat OK
* Document object_rat
* Port documentation from Bom_Chu
* Document/name a few more things
* Name all funcs and struct vars
* Un-name unk_18D
* Name some more stuff
* Final round of docs before I ask for help
* Let's just PR this I suppose
* Respond to isghj5's review
* Name a variable I forgot to name
* hookedState stuff
* Clean up forward declares
* Fix after merge
* Respond to reviews
* Limbs -> Limb
* Names for these rascally Vec3f temps
* Name all the vec3fs for real this time
* world -> surface
* surfaceTangent -> forwardPos; there are many tangents, but only one is forward
* Use Elliptic's names + documentation
* worldForwardInHome -> worldPlusForwardInHome
* first matches
* pst OK
* fix to be OK
* cleaning stuff up
* feedback
* updating names, PR feedback
* PR 3
* whoopsie on the object
* 4got 2 update the name
* fixing anim name
* PR comment
* 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
* 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
MegaIDK