* 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
* sceneNum -> sceneId
* horse data scene -> sceneId
* Clean up scene table
* format
* PR comments
* Some more
* It helps if you actually save the file
* PR
* Remove comment
* Format
* Conflicts
* 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.
* Begin interface alpha docs
* More Interface Alpha
* cleanup docs
* Minor fixes
* Apply Discord Discussions
* More discussions
* More suggestions from OoT
* fix merge
* 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
* 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.
* Make names related to animations more consistent
* Standardize on sAnimationInfo
* Respond to hensldm's review
* Standardize on ChangeAnim
* Respond to hensldm's review
* Small formatting thing
* Consistency after merging master
* A few more things I missed
* Respond to Elliptic's review
* Some more stuff that was requested
* progress
* progress
* 1 function left
* all functions matching
* data imported
* ovl_Dm_Char09 decompiled
* format
* sfx
* constants
* ovl_Dm_Char09 PR
* pr review
* pr review
* format
* csIndex back to temp until we know proper behav.
* 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
* EnSGoro OK and documented
* Format fix attempt for EnSGoro
* Requested format changes
* EnSGoro additional cleanup
* Fixed updated names
* fork merge (wip - don't review)
* Misc. formatting updates
Also had to un-eat some changes made upstream in functions.txt and variables.txt.
* A couple minor tweaks
* current progress
* all functions matching
* data imported correctly (thanks @Maide)
* ovl_Dm_Ah Decompiled
* warnings
* moved the (Player *) casting for cb consistency
* renamings
* thank you @hensldm
* Jenkins being Jenkins
* correction
* 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
* Document object_ma1 (Romani)
* Sync up one of the mouth name textures with how I did it for Cremia
* Specify what the box is for
* Respond to hensldm's review
* Sync texture names with what Anghelo is doing in his Obj_Um PR
* Document a ton of syateki_man
* Document swamp actor lists
* Document animations
* Document player positions
* Document talk flags
* Name wave and spawn index
* Name everything involved in the swamp game
* A hex score I missed
* Some slight town game doc
* Document octorok flags
* Better way of doing octorok flags
* Macros for getting/setting high scores
* Update a variable I missed
* Name remaining struct vars
* Create enum for shootingGameState
* Remove anonymous unions
* hitState -> hitType
* Comment for values next to enums
* Name some more stuff
* Name stuff in Town-RunGame
* Name sGameStartTimer
* Name some more stuff
* Name all static variables
* One more round of comments and such
* Respond to hensldm's review
* GET_INDEX -> GET_ID
* Respond to Elliptic's review (or at least the parts I can respond to right now)
* More review responses
* Add some stuff to z64saves.h I missed
* Message_GetState
* Rename msgCtx->msgLength
* Replace some enums
* TEXT_STATE_CLOSING
* use enum on switches
* use enum when assigning to a variable
* some minor cleanups
* minor cleanup
* TEXT_STATE_CHOICE
* remove unused temp
* z64message.h and z64view.h
* steal some stuff from OoT
* add some stuff to namefixer
* fix shift
* minor doc comment
* Update MessageContext struct from andzura's branch
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
* some other TextState uses I missed
* format
* statetimer in dec
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* Batch () commit
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* bss
* use text state defines on new actors
* fix matching
* bss
Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Document some low-hanging fruit in EnDg
* Animation and type documentation
* Document a bunch of stuff
* Name more functions
* Params macro
* Defines for dog flags
* Name all struct variables
* Give all animations better names
* Better name for Swim2
* Document/name a bunch of stuff
* Make index enum
* Respond to engineer's review
* Respond to mzx's review
* Fix up comment (again)
* Respond to hensldm's review
* OK, data imported
* Fix some typos
* Start docs
* Struct almost finished
* Start object, add state enum
* undefined_syms
* Finish object, name some more stuff
* Name a few states and another function
* PlayState
* Minor tweaks in z_room and z_sub_s
* Complete documentation
* spec
* Review 1
* functions.txt
* Schedule result enum
* Rename schedule results
* Review
* Remove update comments
* Inventory_DeleteItem
* PLAYER_STATE
* Format
* Review
* Update struct name
* Merge in sub_s_models
* Update subs DL names
* Unused Weight pathing
* Function headers for weightpathing
* TimePathing WIP
* Timepathing, still unsure about unk184
* Move subs functions from functions.h to z64subs.h
* Add fake comment
* Some cleanup and renames
* Renames/cleanup of actors that use timepath
* Cleanup
* More cleanup
* Rename unk stuff
* Merge in upstream/master
* TimeElapsed -> elapsedTime
* Fix
* Final cleanup
* SubS Time Paths
* Still needs dialog action functions
* Fix waypoint comments
* Review pt. 1
* Baba review
* ScheduleResult -> ScheduleOutput
* Forgot to update functions.txt oops
* Add clarifying comment to SubS_TimePathing_FillWeightArray
* format.sh
* Finish up docs
* Fix order comments
* Fix
* Change bombShopkeeper struct member to
* Fix a few merge mistakes
* Add ScheduleOutput to namefixer
* format
* Format and fix merge
* Review
* PR
* z64schedule.h
* text summary
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* ovl_Obj_Purify decompiled and partially documented
* document member names
* variable names and format
* oops missed some booleans
* review fixes
* more review fixes
* even more review fixes
* rename ObjPurifyInfoList to sObjPurifyInfo
* OK, start documentation
* Name some more stuff
* Name rest of functions and bss var, tidy up floats
* Document object and paramflags
* Cleanup bat
* Cleanup crow
* Cleanup firefly
* Couple of minor things in arrow
* Review 1
* PLAYER_STATE
* Remove unnecessary f32 casts
* Review
* Review
* all functions matching, data isn't?
* cleanup in progress
* ovl_Dm_Al Decompiled
* pr review
* Documentation Fixes and new entries
* forgot one
* pr review
* almost there
* ovl_Eff_Kamejima_Wave Decompiled
* Us removal
* minor clean up
* pr review
* review
* sikihi rollback and function name fix
* params rename
* SetVtxAlpha
* params prefix
* Jenkins re-run
* 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
engineer124