Commit Graph

1296 Commits

Author SHA1 Message Date
Derek Hensley 0da1ebcaed Combine enums 2022-10-09 11:09:43 -07:00
Derek Hensley 92813146fd Transitions 2022-10-09 10:53:00 -07:00
Derek Hensley 47cabe08c6 Smaller PR comments 2022-10-08 12:29:13 -07:00
Derek Hensley 282ff84f21 bss and I8/I5 functions 2022-10-08 12:17:04 -07:00
Derek Hensley 0aa3ce5990 bss comments 2022-10-08 11:56:52 -07:00
Derek Hensley 62aa2599be Hireso -> BombersNotebook 2022-10-08 11:53:15 -07:00
Derek Hensley d0d6b4783f typedefs 2022-10-08 11:35:00 -07:00
Derek Hensley 3543636c4b remove void 2022-10-08 11:13:45 -07:00
Derek Hensley 2429516cc2 enums 2022-10-08 11:10:54 -07:00
Derek Hensley f283e02887 bss 2022-10-06 20:56:43 -07:00
Derek Hensley ef4db3887f Picto defines 2022-10-06 20:49:46 -07:00
Derek Hensley 7ff9f511ad debug strings 2022-10-06 20:22:09 -07:00
Derek Hensley cbd1d25847 PR small clean ups 2022-10-06 20:05:25 -07:00
Derek Hensley 64ff1f9f7d PR audio 2022-10-06 19:43:03 -07:00
Derek Hensley 9884f42243 PR picto 2022-10-06 19:40:38 -07:00
Derek Hensley 7552a2e6e7 namefixer 2022-10-06 19:23:01 -07:00
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