Commit Graph

264 Commits

Author SHA1 Message Date
Tom Overton 15b9f83bd8
Document object_dnj (Deku Butler) (#1100) 2022-09-30 21:17:34 +01:00
Tom Overton 42a8bf6876
Document BgCraceMovebg (sliding doors in Deku Shrine) and object_crace_object (#1101)
* 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
2022-09-30 20:15:43 +01:00
SonicDcer 1be5a7d2c7
ovl_Oceff_Wipe5 OK (#1011)
* progress

* progress

* ovl_Oceff_Wipe5 OK

* Co-authored-by: Derek-Hensley hensley.derek58@gmail.com

* Co-authored-by: Synray synray@users.noreply.github.com

* Co-authored-by: darkeye darkeye@users.noreply.github.com

* pr review

* pr review

* Magic_Reset

* fixes
2022-09-30 16:37:01 +01:00
SonicDcer 6ff53e448b
ovl_Oceff_Wipe OK (#1008)
* ovl_Oceff_Wipe Decompiled

* format

* format

* pr review

* renaming

* renamings

* renamings

* magic

* pr review
2022-09-30 15:50:59 +01:00
Karen Craig 08be0b3bd4
EnTg OK and documented, object_mu documented (#1042)
* 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>
2022-09-30 02:23:59 +01:00
Isghj 7ed0d14bfe
`En_Ru`: OK (Unused OoT Ruto) (#1035)
* Ruto: OK

* Ruto: better walking water sfx function name and less fake match

* Ruto: formater pls

* Ruto: Requested changes, better display list documentation

* Ruto: requested changes

* Ruto: formater pass

* Ruto: casts were removeable

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Ru/z_en_ru.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Ruto: array size fix

* Ruto: data shuffle solved

* Ruto: requested name changes

* Ru: requested changes

* Ru: count instead of size

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-09-30 01:29:25 +01:00
StickyThwomp 084bafcfcc
ovl_En_Nimotsu OK and documented (#1028)
* 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.
2022-09-29 03:57:00 +01:00
Tom Overton 91d4e29dfa
Document object_zos (Evan) (#1091)
* 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
2022-09-27 22:48:57 +01:00
Tom Overton aa54982318
EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented (#1043)
* 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
2022-09-27 20:50:02 +01:00
SonicDcer 363a7cda46
ovl_Oceff_Wipe4 OK (#1007)
* ovl_Oceff_Wipe4 decompiled

* pr review

* renamings

* renamings

* Material -> Model

* pr review

* Magic_Reset
2022-09-27 03:35:50 +01:00
Tom Overton 72d24b9995
Give Deku Princess/King/Butler's objects the "correct" name (#1084)
* Give Deku Princess/King/Butler's objects the "correct" name

* Document the actor/object discrepancy in the actors

* format
2022-09-27 00:59:31 +01:00
engineer124 00bf71460f
Item cleanup: Item drops, rupees, signs (#1048)
* item cleanup

* pr suggestions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-09-24 16:45:53 -03:00
Tom Overton 3d24a8be68
Document object_bdoor (Boss Doors) (#1087) 2022-09-24 16:15:18 -03:00
Tom Overton fc94be22ac
Document object_az (Beaver Bros.) (#1083)
* Document object_az (Beaver Bros.)

* Respond to Elliptic's review
2022-09-24 16:09:58 -03:00
Derek Hensley c222747977
Object_trt documented + other shopkeeper cleanup (#1081)
* trt skel

* Some cleanup

* Textures

* Better Tex names

* Small renames

* Animations

* Animation enum

* trt2

* format

* Update assets/xml/objects/object_trt.xml

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update assets/xml/objects/object_trt.xml

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Whitespace

* HairPiece -> Braid

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-09-24 16:03:34 -03:00
Tom Overton 6bd4b58eb5
Document object_gs (Gossip Stone) (#1078)
* Document object_gs (Gossip Stone)

* Fix one of the names
2022-09-24 15:58:48 -03:00
Tom Overton 76dc0dd867
Document object_dblue_object (Great Bay Temple objects) (#1077)
* 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
2022-09-24 15:51:10 -03:00
Tom Overton a390da9b56
Document object_warp1 (blue warp, warp crystal, boss warp) (#1075)
* Document object_warp1 (blue warp, warp crystal, boss warp)

* Fix description for actor
2022-09-24 15:45:46 -03:00
Tom Overton 8fa3a58b35
Document object_market_obj (West Clock Town Market) (#1074)
* Document object_market_obj (West Clock Town Market)

* Update the names of ground textures

* Respond to Elliptic's review
2022-09-24 15:40:36 -03:00
Tom Overton be121f7dd7
Document Song of Time Clock assets in gameplay_keep (#1068) 2022-09-24 15:34:59 -03:00
Tom Overton 4088aea3f7
Document object_lotus (lily pad) (#1067) 2022-09-24 15:28:49 -03:00
Tom Overton 62502ac22f
Document object_mtoride (Woodfall scene objects) (#1062)
* Name everything in object_mtoride

* Get ready for PR

* Update some of the names
2022-09-24 15:21:01 -03:00
Tom Overton fd5ff73a35
Extract assets from link_animetion (#1056)
* Extract assets from link_animetion

* Add empty last line
2022-09-24 15:14:59 -03:00
Tom Overton 0aede274ae
Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object (#1055)
* Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object

* Respond to hensldm's review
2022-09-24 14:54:40 -03:00
Parker Burnett b4adfb0a22
Fbdemo_triforce OK with documentation (#1053)
* close to done

* OK and doc'd

* PR feedback

* 4mat

* PR feedback round 2

* fixed engineers comment
2022-09-24 14:49:07 -03:00
Derek Hensley 77be902c25
Effect Bomb2 Ok (#1039)
* OK

* PR
2022-09-24 14:31:20 -03:00
Derek Hensley 1402db4008
Effect Dfire OK (#1038)
* OK

* rename function

* MTXMODE enum

* PR

* Format

* % -> &

* note
2022-09-24 14:26:08 -03:00
Derek Hensley b5a9189cef
Effect Deaddb OK (#1037)
* OK

* Add description

* format

* Fix EffectSsDeadDbInitParams size comment
2022-09-24 14:21:08 -03:00
Derek Hensley 71e4046415
Effect Deadds OK (#1018)
* OK

* cleanup

* Fix merge

* Small cleanups
2022-09-24 14:15:48 -03:00
Derek Hensley f31056ef8a
Effect Dust OK (#1016)
* OK

* Some cleanup

* Description

* format

* Better name

* whoops

* Array count

* Name dust texture arrays

* Fix

* static

* Update dust tex outnames
2022-09-24 14:04:03 -03:00
engineer124 6451bcf158
`z_parameter`: Magic (#934)
* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
2022-09-14 13:49:17 -03:00
Alejandro Asenjo aa6841a33b
ovl_Oceff_Wipe2 OK (#1006)
* ovl_Oceff_Wipe2 Decompiled

* pr review

* renamings

* renamings
2022-09-14 13:21:02 -03:00
Alejandro Asenjo 33f7ede84f
ovl_Oceff_Spot OK (#1004)
* ovl_Oceff_Spot decompiled

* format

* renamings and pr review

* pr review

* pr review
2022-09-14 13:07:46 -03:00
Alejandro Asenjo e47dc7da25
ovl_Oceff_Wipe3 OK (#1001)
* all functions matching

* ovl_Oceff_Wipe3 decompiled

* bss

* pr review

* pr review

* renamings

* pr review
2022-09-14 12:57:47 -03:00
Parker Burnett 3d430a5733
En_bubble OK (#995)
* bubble OK

* fixing elfbulb

* flag fix

* PR comments

* PR comments

* missed a fix

* PR fixes

* don't know how this got in there

* u to s

* small fix
2022-09-14 12:46:16 -03:00
Alejandro Asenjo 90ade1be9f
ovl_En_Js Decompiled (#991)
* progress

* progress

* func_80968E38 (thanks @engineer124)

* progress

* remove comments

* general cleanup

* warnings

* all functions matching

* macros

* final details

* format

* ovl_En_Js Decompiled

* PLAYER_AO enums

* fix

* pr review

* re preview

* pr review

* pr review

* pr review

* resolving after merge

* conflict resolution

* pr review

* pr review

* pr review
2022-09-14 12:37:21 -03:00
Derek Hensley f3a51c5403
General Cleanup 10 (#990)
* limbs -> limb

* Generated limbs

* Fix ENUMNAME

* goronLink fix

* actually save

* Boss011Limbs -> Boss011Limb

* keep skeletons

* remove comments
2022-08-15 20:40:41 -04:00
Alejandro Asenjo 4b545bc259
ovl_Oceff_Wipe7 OK (#1009)
* progress

* ovl_Oceff_Wipe7 OK

* pr review

* format

* renamings
2022-08-15 14:27:30 -04:00
Tom Overton b2996b0352
object_thiefbird (Takkuri) documented (#1002) 2022-08-15 14:23:38 -04:00
Tom Overton e44c98884b
EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀💣 (#966)
* 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
2022-08-15 14:16:31 -04:00
Tom Overton f4f0ce7523
EnPp (Hiploop) OK and documented, object_pp documented (#997)
* EnPp OK

* Format

* Animation naming consistency

* Respond to jpburnett's review

* Animation name consistency
2022-08-09 20:44:07 -04:00
Parker Burnett b14656c529
En_pst OK (#983)
* 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
2022-08-09 20:30:11 -04:00
Alejandro Asenjo ed7102727f
ovl_Obj_Taru Decompiled, object documented (#979)
* all functions matching, thanks Anon58 and mzxrules

* data imported, objects documented

* ovl_Obj_Taru Decompiled, object documented

* warnings fixed

* boolean and renamings
2022-08-09 20:15:50 -04:00
Derek Hensley 0395b7bd4f
docs (#978) 2022-08-09 20:07:31 -04:00
Derek Hensley b716e76d3e
Effect EnFire OK (#977)
* OK

* Gameplay keep fire

* &

* &2

* PR

* Fire textures

* Second mask
2022-08-07 19:59:23 -04:00
Tom Overton dbe98b9776
Document powder keg assets (#967)
* Document powder keg assets

* Add "barrel" to one of the asset names

* Update variables.txt

* ptr -> fuseSegmentPtr
2022-08-07 19:38:37 -04:00
Derek Hensley d0313fa766
Effect EnIce OK (#976)
* Ok

* Material/Model

* Cleanup

* format

* IceFragment Assets

* PR
2022-08-07 19:29:03 -04:00
Derek Hensley bc3883d098
Effect Fhgflash OK (#975)
* OK

* format

* extract tex explicitly

* FHGFLASH_SHOCK_NO_ACTOR

* typo

* Hitmark

* sZeroVec

* eff
2022-08-07 19:24:05 -04:00
Derek Hensley 9f6bacbb88
Effect Firetail OK (#974)
* OK

* description

* gEffFire1DL

* format

* PR
2022-08-07 19:18:54 -04:00
Alejandro Asenjo a6bec3ecc2
ovl_En_Test2 Decompiled (#968)
* all functions matching

* all functions matching

* data problem

* ovl_En_Test2 Decompiled

* format + fix constants

* final details

* pr review

* pr review

* pr review
2022-08-07 18:52:01 -04:00