2954 Commits
Author SHA1 Message Date
petrie911 ead7e4c594 merge again 2022-10-04 16:57:36 -05:00
petrie911 b68c1edbcd Merge remote-tracking branch 'upstream/master' into Mine 2022-10-04 16:44:18 -05:00
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
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 BurnettandGitHub 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
SonicDcerandGitHub 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
SonicDcerandGitHub 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
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
mzxrules 0a8d285a02 Merge remote-tracking branch 'origin/master' into z_map_ 2022-10-03 16:28:07 -04:00
engineer124 f85afc978f more docs 2022-10-03 09:37:48 -04:00
engineer124 bdb2001b05 time, button, misc docs 2022-10-02 22:29:01 -04:00
engineer124 ddbc03fed3 merge master 2022-10-02 19:56:28 -04:00
engineer124andGitHub 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
MaideandGitHub 0e2de439dd Dm_Tag (#922)
* Dm_Tag

* PR

* Fix

* PR

* PR
2022-10-02 19:31:55 +01:00
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 OvertonandGitHub 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 HensleyandGitHub 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
engineer124andGitHub 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
engineer124 cd05be7049 some docs 2022-10-02 09:18:23 -04:00
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
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
engineer124 c0b227ff17 more docs 2022-10-01 15:29:45 -04:00
engineer124 78ec6752b8 update button comments 2022-10-01 15:12:49 -04:00
engineer124 049559804a begin vtx docs 2022-10-01 14:33:12 -04:00
Tom OvertonandGitHub 82afae675b Replace player animation names with original names derived from OoT3D/MM3D (#1103) 2022-10-01 17:08:47 +01:00