3145 Commits
Author SHA1 Message Date
engineer124 bea9c0341e Restore DW with a match 2022-06-21 03:08:57 +10:00
engineer124 19393504c6 Merge branch 'master' into parameter 2022-06-21 02:57:44 +10:00
Alejandro AsenjoandGitHub c6963e27d0 ovl_Item_Etcetera decompiled (#849)
* ovl_Item_Etcetera decompiled

* PR review fixes

* PR Review Fixes

* pr review fixes

* pr review fixes

* pr review fixes

* final

* merge

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 17:26:48 +01:00
engineer124 d8085bd476 Merge branch 'master' into voice 2022-06-20 23:00:01 +10:00
engineer124 2af30485fd Fix merge 2022-06-20 22:53:22 +10:00
engineer124 e4904450de Merge branch 'master' into parameter 2022-06-20 21:14:44 +10:00
37d3934e2c Code_800E8EA0 Docs (#832)
* Start

* Add notes from OOT

* D_801D0D50 -> gDbgCamEnabled

* Rotation Functions

* Text function

* RotateBack -> RotateForward

* Flags functions

* Document rotation func returns

* Remove comment from play

* Rename play function, add notes about Flags, add notes about focus

* Update notes a little

* Update src/code/code_800E8EA0.c

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

* Fix apostrophes

* Bring over OoT changes

* TurnTo -> Track in SubS systesm

* format and remove OoT specific comment

* Remove old comments

* namefixer

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-20 01:16:30 +01:00
Tom OvertonandGitHub 6d371502e1 Actor effect cleanup (#828)
* Change "particle" to "effect" in most actors

* Undo accidental comment change

* Effect count defines

* Make struct names consistent

* Fix minislime

* Change particle to effect in Demo_Kankyo

* Some tiny things I missed
2022-06-20 01:11:47 +01:00
Derek HensleyandGitHub 9682995b04 Controller Macros Update (#852)
* macros

* Format, I will remember 1 day
2022-06-20 00:57:23 +01:00
d318b1f285 SubS Time Paths (Finale) (#823)
* Merge in sub_s_models

* Update subs DL names

* Unused Weight pathing

* Function headers for weightpathing

* TimePathing WIP

* Timepathing, still unsure about unk184

* Move subs functions from functions.h to z64subs.h

* Add fake comment

* Some cleanup and renames

* Renames/cleanup of actors that use timepath

* Cleanup

* More cleanup

* Rename unk stuff

* Merge in upstream/master

* TimeElapsed -> elapsedTime

* Fix

* Final cleanup

* Fix waypoint comments

* Review pt. 1

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Fix order comments

* weightArray -> knots

* Review pt 1

* Review pt 2

* Update src/code/z_sub_s.c

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

* Update src/code/z_sub_s.c

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

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-20 00:49:20 +01:00
a039a2f34a BgIkanaDharma (punchable pillar segments in STT) OK (#851)
* Bg_Ikana_Dharma decompiled

* Bg_Ikana_Dharma more stuff

* remove & from function pointers

* use THIS macro

* use THIS macro

* return -> else

* GET_PLAYER

* slightly better match (this2 only used once)

* fix warnings; name variables

* better match in BgIkanaDharma_Init; more param macros

* Rebase to latest master and some minor cleanup

* More cleanup

* Document object

* Respond to isghj5's review

* Respond to Elliptic's review

* Better pack macro

* Respond to hensldm's review

Co-authored-by: immibis <immibis@gmail.com>
2022-06-20 00:38:51 +01:00
Alejandro AsenjoandGitHub 064b3e5493 ovl_Obj_Rotlift decompiled (#850)
* ovl_Obj_Rotlift decompiled

* fixes

* fixes 2

* format

* PR review fixes

* PR review fixes

* PR review fixes

* PR review fixes

* PR review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:31:01 +01:00
Alejandro AsenjoandGitHub 2c10d51022 ovl_Bg_Ikninside OK (#848)
* ovl_Bg_Ikninside decompiled

* PR review fixes

* pr review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:21:44 +01:00
Alejandro AsenjoandGitHub 8d6b4d68ad ovl_Bg_Keikoku_Saku decompiled (#847)
* ovl_Bg_Keikoku_Saku decompiled

* reloc change

* BGKEIKOKUSAKU_GET_SWITCHFLAG name fix

* pr review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:18:03 +01:00
Alejandro AsenjoandGitHub f0c1e17fd0 ovl_Dm_Bal decompiled (#846)
* All functions match, data import problem present

* * importing succeed
* final clean up
* fixed warnings

* pr fixes

* pr review fixes

* PR review fix

* pr review fixes

* fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:13:25 +01:00
Alejandro AsenjoandGitHub 1ce5d13677 z_dm_opstage decompiled (#845)
* z_dm_opstage progress

* z_dm_opstage decompiled

* pr review fixes

* pr review fixes

* pr review fixes

* params var removal

* macro tunning + params removal

* final (hopefully)

* prototype was unnecessary

* pr review  changes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:07:13 +01:00
Alejandro AsenjoandGitHub 9e6bc5db8b ovl_en_hata decompiled (#844)
* z_en_hara progress

* ovl_En_Hata Decompiled

* PR review fixes

* pr review fixes

* PR review fixes

* format

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:00:03 +01:00
Alejandro AsenjoandGitHub aea2e67f79 z_en_sc_ruppe decompiled (#843)
* z_en_sc_ruppe decompiled

* PR Review fixes

* PR Review fixes

* PR review fixes

* pr review fixes

* pr review fixes

* Ruppe -> Rupee

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:52:45 +01:00
Alejandro AsenjoandGitHub 3997776e5b obj_boat decompiled (#842)
* obj_boat decompiled

* PR review fixes

* pr review fixes

* PR Review fixes

* PR review fixes

* final cleanup

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:45:00 +01:00
ab7625db65 DmZl OK and some docs of object_zl4 (Child Zelda used in one cutscene) (#834)
* DmZl: start

* DmZl: progress

* DmZl4: progress

* DmZl: OK

* DmZl: data integrated

* DmZl: object docs

* DmZl: more object docs

* DmZl: more docs

* DmZl: Some Zl4 animations

* ObjectZl4: docs

* DmZl: formater pass

* DmZl: more docs

* DmZl: docs

* DmZl: params documentation

* Apply suggestions from code review

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

* DmZl: requested changes, minor fixes, formater pass

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update assets/xml/objects/object_zl4.xml

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* DmZl: some requested changes

* DmZl: Change Eye Texture names for accuracy, formatter pass

* DmZl: Eye texture indexes specified

* DmZl: fixed struct variable names

* DmZl: some requested changes

* DmZl: removed comment

* DmZl: change to unused index

* DmZl: changed some xml comments

* DmZl: requested changes 1

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* DmZl: fixing issues, formatter pass

* DmZl: moved switch case

* DmZl: fixed object reference, wrong file

* Update src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

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

* Update assets/xml/objects/object_zl4.xml

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

* DmZl: mouth and eye state comments

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 23:36:07 +01:00
Alejandro AsenjoandGitHub 67345d9be5 z_bg_astr_bombwall decompiled (#841)
* z_bg_astr_bombwall decompiled

* review fixes

* formatting

* pr review fixes

* PR review fixes

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:28:48 +01:00
Derek HensleyandGitHub 689ef2fe0b Effect Icepiece OK (#839)
* OK

* Final cleanup

* format

* PR plus forgot to rename Matrix_RotateY
2022-06-19 23:18:54 +01:00
Derek HensleyandGitHub 1a37ef95d1 Effect Icesmoke OK (#838)
* Ok

* Name DL and tex

* Matrix renames
2022-06-19 23:10:21 +01:00
Derek HensleyandGitHub 9831e5e063 Effect Kfire OK (#837)
* OK

* Small change

* Matrix renames

* else if
2022-06-19 23:05:12 +01:00
EllipticEllipsisandGitHub 7ca70d496d Change Rand_Next to u32, document rand.c a bit more (#819)
* Change Rand_Next to u32, document rand.c a bit more

* Clean up the quotes a bit, add another note

* Format

* — -> -

* Review

* Remove unnecessary casts

* Remove quote, reformat the comments

* Fix new files

* Make docs a bit more consistent and specific

* Format
2022-06-19 04:14:55 +01:00