1404 Commits

Author SHA1 Message Date
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
engineer124
1af942ae12
Audio Sequences: Scene/Ambience/SeqFlags Functions OK (#1033)
* import audio scene seq docs

* cleanup

* fix scene cmd

* small fixes

* more PR suggestions

* missed comment

* rename spot to resume

* cleanup comments

* SEQ_IO_VAL_NONE

* Empty-Commit

* another PR suggestion
2022-09-30 08:49:35 -03:00
Derek Hensley
3a723efb15
SceneNum -> SceneId (#1036)
* 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
2022-09-30 03:22: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
engineer124
8f2fe9b3c7
z_parameter: Timers (#1031)
* import timers from parameter branch

* more cleanup

* small namechange

* improved docs

* more cleanup

* one more namechange

* another small cleanup...

* fix destroy

* plurals

* revert graphic function names

* PR suggestions, better docs

* revert namechange, better postman timer name

* oops

* fix merge

* fix merge

* fix bss

* PR Suggestions
2022-09-29 09:57:44 -03: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
SonicDcer
cc52da9952
ovl_Obj_Swprize OK (#1021)
* ovl_Obj_Swprize OK

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

* pr review

* pr review

* pr review
2022-09-29 02:47:38 +01:00
engineer124
5e860dd3e7
z_parameter: Hud Visibility (#942)
* Begin interface alpha docs

* More Interface Alpha

* cleanup docs

* Minor fixes

* Apply Discord Discussions

* More discussions

* More suggestions from OoT

* fix merge
2022-09-28 19:47:46 -03: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
Tom Overton
f0311e6ca4
Document EnSyatekiCrow (#1063)
* Document EnSyatekiCrow

* Simplify static var names

* Respond to Elliptic's review
2022-09-27 18:28:39 +01:00
Tom Overton
77d8e386a3
Add comments to everything in the scene enum (#1052)
* Add comments to everything in the scene enum

* Respond to isghj5's review

* Respond to Elliptic's review
2022-09-27 13:42:15 +01:00
engineer124
ee82e65c1a
z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027)
* import wip from kaleido

* small cleanup

* add for-loop comments

* pr review 1

* spacing

* Update src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-27 04:37:00 +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
Derek Hensley
6d6304d1a0
Gamestates Cleanup (#1047)
* Setup

* ConsoleLogo

* TitleSetup

* MapSelect

* FileSelect

* Daytelop

* Save file

* PreNMI

* Final cleanup and format

* Update include/functions.h

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

* DayTelop

* Split off setup

* split of prenmi

* readd SET

* shorten some gamestate member names

* Add comment about init

* Update include/z64.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Small cleanup of comments

* PR

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-09-24 16:40:40 -03:00
engineer124
0e1b244354
Audio: Various Cleanup and Docs (#1034)
* cleanup and docs

* pr suggestions

* audio errors

* fix bss

* Empty-Commit
2022-09-24 16:35:37 -03:00
engineer124
37a9b8e3c4
ActorContext Flags (#1060)
* actor context flags

* bracket cleanup

* comment out recursive name-fixer

* Empty-Commit
2022-09-24 16:29:21 -03:00
Tom Overton
6fab0f962c
Fix up some actor descriptions (#1059)
* Fix up some actor descriptions

* Respond to Elliptic's review

* Add ObjDowsing description

* Respond to hensldm's review

* Fix bad find-replace issue
2022-09-24 16:24:39 -03:00
Tom Overton
96986bc3f1
Cleanup some "raw" actor flags (#1044)
* Cleanup some "raw" actor flags

* Respond to Anghelo's review
2022-09-24 16:20:12 -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
SonicDcer
c23112c855
ovl_En_Bee OK (#1086)
* all functions matching

* initial cleanup

* tatl hint

* clean up + SFX

* SFX

* more SFX

* func_800B3030

* SFX FIX

* castings

* clean up

* array of Vec3f

* for loop fix (Thanks @Maide)

* ACTORCAT_ITEMACTION

* a few nits

* ACTORCAT_ENEMY

* actor struct size restored

* ACTORCAT_ENEMY

* Update src/overlays/actors/ovl_En_Bee/z_en_bee.c

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

* parenthesis

* parenthesis

* merge fail

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-09-24 15:07:11 -03:00
StickyThwomp
d968e58f9c
Obj_Kendo_Kanban OK and Documented (Decomp was mostly done already) (#1057)
* 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.
2022-09-24 15:00:53 -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
engineer124
cdee1fc45b
z_kaleido_prompt.c Ok and Documented (Pause Menu Save/Continue Prompt. Unused) (#1045)
* kaleido prompt ok

* fix pauseCtx
2022-09-24 14:43:21 -03:00
Derek Hensley
71a18d70cf
OK (#1040) 2022-09-24 14:36:55 -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
fb4ca3fb17
Effect DtBubble OK (#1017)
* OK

* Some cleanup

* Format

* Name enum
2022-09-24 14:09:46 -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
Parker Burnett
2c6816ba77
Add enum for tatl hint id (#993)
* first round, need to investigate the others

* naming the remainder

* changed my mind on the name

* foooooormat

* fixing a number

* ...another one...

* names galore

* PR feedback

* fixing

* fixes

* 4mat

* adding "POE_SISTER"

* forgot a rename
2022-09-14 14:01:06 -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
Loïs
85e141128b
set LANG variable to C (#888)
Co-authored-by: Loïs <loislag@outlook.fr>
2022-09-14 13:39:55 -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