Commit Graph

431 Commits

Author SHA1 Message Date
Derek Hensley 9884f42243 PR picto 2022-10-06 19:40:38 -07:00
Derek Hensley c13db6e268 Cleanup PR commits outside play 2022-10-06 19:06:54 -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 506ff57b74 Merge remote-tracking branch 'upstream/master' into play 2022-10-05 19:50:49 -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 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 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
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
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
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
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
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
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 f2d272f50b misc play docs 2022-09-30 11:11:01 -04: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
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
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
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
engineer124 1c8d95d04b merge master 2022-09-25 18:48:20 -04: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
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 71a18d70cf
OK (#1040) 2022-09-24 14:36:55 -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
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
engineer124 16758bd7bd Play_Draw WIP Thanks @petrie911 2022-08-20 16:57:11 -04:00
engineer124 a0f786c2ad small docs 2022-08-20 12:00:43 -04:00
engineer124 9001ed07b7 slightly more docs 2022-08-20 11:47:33 -04:00
engineer124 8673cbe677 cleanup Play_Update 2022-08-20 11:21:40 -04:00
engineer124 b4463f0d5f import transition docs from OoT 2022-08-20 02:03:34 -04:00
Derek Hensley 6476e90bb7 Match func_80166B30 and diff fake match in Init 2022-08-19 17:37:12 -07:00
engineer124 28ef080dbf more docs and cleanup 2022-08-19 19:30:53 -04:00
engineer124 36ce1ab877 add docs from debug 2022-08-19 19:16:59 -04:00
engineer124 e975c4df38 cleanup 2022-08-19 18:41:33 -04:00
engineer124 a1ed41ecea match Play_Main thanks to debug 2022-08-19 18:22:55 -04:00
Derek Hensley dd363101b7 Matched func_801691F0 2022-08-19 00:12:00 -07:00
Derek Hensley e1c17c5da3 Match func_80168DAC 2022-08-19 00:01:29 -07:00
Derek Hensley afffe39763 Match func_80167F0C 2022-08-17 21:44:34 -07:00
Derek Hensley f5e71876ef Match func_80167DE4 (from debug) 2022-08-17 21:19:40 -07:00