Commit Graph

1280 Commits

Author SHA1 Message Date
Derek Hensley c13db6e268 Cleanup PR commits outside play 2022-10-06 19:06:54 -07:00
angie 84842bf284 fix circular dependency problem 2022-10-06 12:46:56 -03:00
Derek Hensley 76334def1e regs 2022-10-05 21:43:56 -07:00
Derek Hensley 234e97538e Pictographs some more 2022-10-05 21:42:45 -07:00
Derek Hensley 1eca2fc63f Floor Surface 2022-10-05 20:42:19 -07:00
Derek Hensley 9d033cd27a MotionBlur Clean up 2022-10-05 20:12:27 -07:00
Derek Hensley 506ff57b74 Merge remote-tracking branch 'upstream/master' into play 2022-10-05 19:50:49 -07:00
Derek Hensley ed3f288130 Init 2022-10-05 19:38:34 -07:00
Derek Hensley 3a8aa58146 Picto functions 2022-10-05 19:34:41 -07:00
Derek Hensley 6cb774232d Camera Functions 2022-10-05 19:16:14 -07:00
Derek Hensley 56600ee4fc bss 2022-10-05 17:13:11 -07:00
Parker Burnett 589925ce3e
Update permuter_settings.toml (#1107)
Noticed this was missing
2022-10-05 18:38:42 +01:00
Derek Hensley 80af6ca479 Bombers notebook + small cleanup 2022-10-04 22:47:11 -07:00
engineer124 f379012742
z_kaleido_map.c OK and Documented (Pause Menu Map Page) + related icon_item statics (dungeon/field/jpn) (#1094)
* import pause menu map page

* better owl-warp docs

* fix func name

* missed some owlwarps

* fix merge from master

* fix scene region code

* PR Suggestions

* add comment

* add description of gWorldMapImageTex, thanks @EllipticEllipsis

* clearup docs

* missed a comma

* bad formatter, drop comment

* more cleanup
2022-10-05 06:15:39 +01:00
Derek Hensley 5631915dd5 Fog 2022-10-04 22:05:58 -07:00
Derek Hensley 8582c2a7e2 Transitions 2022-10-04 21:19:22 -07:00
Derek Hensley 4e809f1c17 Motion Blur 2022-10-04 20:29:59 -07:00
Derek Hensley a82d37825c transitions cleanup 2022-10-04 19:51:02 -07:00
Derek Hensley c8d7e4de3b Merge remote-tracking branch 'upstream/master' into play 2022-10-04 17:38:41 -07:00
petrie911 2006a65ba6
z_overlay and z_fbdemo_dlftbls (Transition overlay handling), clean up a lot of u32s used to store pointers (#1073)
* overlay matches

* prototypes

* fbdemo too

* virtual to physical

* names, cleanup, etc

* bss reordering

* uintptr stuff

* fixed now?

* one fix

* headers and such

* fixes'n'stuff

* XXX action

* docs of a sort

* useless error codes

* n

* format

* header? I barely know her!

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
2022-10-04 21:46:32 +01:00
Tom Overton 8cd48db087
Better match for BgKin2Fence_CheckHitMask (#1105)
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-04 20:23:13 +01:00
Parker Burnett 6c414889c9
Fbdemo_circle OK (#1024)
* 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
2022-10-04 13:55:20 +01:00
SonicDcer 4833c08364
ovl_Oceff_Storm OK (#1010)
* all functions matching

* all functions matching

* all functions matching (for real this time)

* data extracted and imported

* ovl_Oceff_Storm OK

* reloc

* pr review

* texture name

* renamings

* renamings

* Magic_Reset

* pr review

* gSPTextureRectangle

* pr review
2022-10-04 05:03:53 +01:00
SonicDcer 362a73a017
ovl_En_Bombal OK (#1051)
* ovl_En_Bombal OK

* alpha

* decimal values for weekEventReg

* pr review

* cutscenes

* merge fix

* pr review
2022-10-04 04:36:12 +01:00
Derek Hensley 26207594f2
Format Script Update (#904)
* Bring over format.sh and .clang-tidy and run it

* Little fixes

* Adjustments

* Jenkins kick

* Jenkins kick 2

* format

* small fixes

* Bring over new formatter by Roman

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Force use of clang-11

* check_format

* Update error messages

* Fix from Tharo for python3.6

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Just use nproc to determine num jobs for check format

* Update error message

* AnimatedMat_DrawStepOpa texture arg -> matAnim

* Fix enTwig draw prototype

* Tidying up

* Bring over fixes in OoT #1387

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Fix

* Update doc tools

* PR

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-10-04 04:06:04 +01:00
engineer124 3e32379c2b
audio_synthesis.c OK and Documented (#1090)
* import synth docs

* cleanup

* small followup cleanup

* PR Suggestions, small cleanup

* fix bss

* PR suggestion

* fix enum

* PR Suggestions
2022-10-02 20:24:10 +01:00
Maide 0e2de439dd
Dm_Tag (#922)
* Dm_Tag

* PR

* Fix

* PR

* PR
2022-10-02 19:31:55 +01:00
Derek Hensley fdfe2842d9
Eff Srchball OK (#1092)
* 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>
2022-10-02 18:10:31 +01:00
Tom Overton 3d5d39e74d
Document leftover pause joint tables (#1104)
* Document leftover pause joint tables

* Grab the other two joint tables

* Document the deku stick thing

* Add @bug to comment
2022-10-02 17:16:30 +01:00
Derek Hensley aa3f1be55e
Object Tru Docs (Koume) (#1098)
* Name everything in xml

* Actor docs regarding assets

* move header include

* PR

* Format

* PR

* MT animation enum

* index ()
2022-10-02 13:07:55 -03:00
engineer124 841da5f138
View & Shrink_Window Docs (#1049)
* view and shrink_window docs

* cleanup

* move func declaration to header

* move struct to local

* PR Suggestions

* g to s
2022-10-02 11:32:57 -03:00
chloe!! 063d24f491
ovl_En_Door_Etc OK (#994)
* ovl_En_Door_Etc OK

* review fixes

* more review fixes

* name yawDiff variables

* various vixes

* Update src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c

Co-authored-by: Chloe <>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-02 06:07:07 +01:00
Derek Hensley 84d77d5101
EnMThunder Ok with some docs (#1082)
* Match EnMThunder_Init

* Match func_808B53C0

* Match func_808B65BC

* Match func_808B6310

* Match func_808B5EEC

* Matched func_808B60D4

* Match func_808B5F68

* Match func_808B5984

* Matched func_808B58CC

* Matched EnMThunder_Destroy

* Matched EnMThunder_Update

* Matched EnMThunder_Draw

* Matched data

* Doc WIP

* Code docs

* Assets

* PR

* Rename one more function from OoT WIP docs

* Update src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c

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

* PR

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-10-02 05:00:52 +01:00
Tom Overton 82afae675b
Replace player animation names with original names derived from OoT3D/MM3D (#1103) 2022-10-01 17:08:47 +01:00
Tom Overton c3c08e944c
EnWiz (Wizrobe) OK and documented, EnWizFire (Wizrobe Magic) documented, object_wiz documented (#1054)
* 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
2022-10-01 16:14:06 +01:00
Tom Overton bbc8aec36a
(Mostly) document EnSyatekiDekunuts (Shooting Gallery Deku Scrub) (#1095)
* (Mostly) document EnSyatekiDekunuts (Shooting Gallery Deku Scrub)

* Respond to Elliptic's review
2022-09-30 23:55:05 -03:00
Derek Hensley 4935ec7ba1
Rename SetupIndex to Layer (#1099)
* Rename setupIndex to Layer

* ()
2022-09-30 23:34:28 -03:00
engineer124 ab5fd663cc
Quake & Distortion Cleanup (#1102)
* quake cleanup

* cleanup

* more cleanup

* remove cast

* q comes before r...

* unname goron function, leave it to another PR

* PR Suggestions
2022-09-30 23:01:39 -03:00
engineer124 b080fb3700
z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093)
* import mask docs

* cleanup

* some PR

* fix merge from master

* fix merge

* move cursor result
2022-10-01 01:51:49 +01:00
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
engineer124 f2d272f50b misc play docs 2022-09-30 11:11:01 -04: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 918e263e78 merge master 2022-09-30 10:09:44 -04: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