Commit Graph

1269 Commits

Author SHA1 Message Date
angie 48fe9d0f46 fix merge 2023-09-19 15:32:30 -03:00
angie 09a1d31be0 fix typo 2023-09-19 15:00:10 -03:00
angie 24aea7cafd Merge remote-tracking branch 'upstream/master' into ultracleanup2 2023-09-19 14:58:45 -03:00
Nuss fa71fbeaab Stone Tower Smoke (#1382)
* funen xml

* description

* outname
2023-09-19 15:04:23 +10:00
engineer124 df800c74ae PreRender.c OK (#1320)
* begin prerender

* match func_801716C4

* copy more docs from OoT

* begin func_801720FC

* improve func_801720FC

* match func_801720FC

* background 2D

* merge master

* func_801717F8 attempt

* z64prerender.h

* import bss

* non-equivalent

* document func_801716C4

* cleanup comments

* import tharo docs

* minor improvement on PreRender_DivotFilter

* Match PreRender_DivotFilter

* Remove fakes

* format

* Fix comment about RM_VISCVG in PreRender_FetchFbufCoverage

* PreRender cleanup

* PR Review

* review

* listalloc.h

* bss

* capitalization

---------

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-09-15 19:34:16 -03:00
Anghelo Carvajal 4b30f1a654 Move libultra variables to their respective headers (#1369)
* internal_rsp; move size_t and NULL to ultratypes.h

* guint.h

* Move system variables to os_system.h

* controller, pi and vi

* osint.h

* piint.h

* siint, ucode, viint, voiceinternal

* Remove remaining variables from variables.h

* format

* final renames

* bss

* review

* review
2023-09-15 11:02:27 -03:00
Derek Hensley 626f09266d Flash Headers (#1367)
* Move flash stuff

* format

* Cleanup

* format

* bss names

* Small cleanup

* osFlashGetAddr

* uintptr_t
2023-09-15 09:41:51 -03:00
AbdooOwd 57501ed415 z_obj_tokei_tobira OK undocumented (#1336)
* Fixes

* `z_obj_tokei_tobira` OK undocumented

* Revert "Fixes"

This reverts commit b3358254df.

* Fixes

* Data imported + Code Optimization

* Formatting

* cleaning + fixes

* formatting

* More fixes

* Last fixes

* OK undocumented

* More fixes

* Fixes

* Formatting again

* I hate Jenkins

* Removed a comment

* Review apply

* Formatting

* Applied reviews

* Review Applied

* Update src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h

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

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-09-15 00:39:21 -03:00
MegaIDK 0c7b90cf97 document object_fish (#1359)
* initial commit of object_fish documentation

* spaces after offset

* separate categories

* extra owner

* name changes

* forgor the .c

* format

* changed name of funcit

* forgor some OutName
2023-09-14 21:48:57 +10:00
Tom Overton cd38fbbab4 Change all uses of "rotational velocity" to "angular velocity" (#1375)
* Change all uses of "rotational velocity" to "angular velocity"

* Respond to review
2023-09-14 12:06:52 +10:00
Tom Overton 17068dadef EnInvadepohDemo (Aliens cutscene actors) OK and documented (#1363)
* EnInvadepohDemo (Aliens cutscene actors) OK and documented

* Make bss variables non-static

* Provide type to Actor_SpawnAsChild

* Respond to hensldm's review

* Introduce obvious misformat

* Format again, see if that fixes it?

* Push the misformat up so I can see how Jenkins complains

* Fix formatting on my end (again)

* Apparently I had to merge master to fix the formatting issue??????

* Respond to engineer's review
2023-09-14 11:29:30 +10:00
Derek Hensley 190b78549e Non libultra Boot Cleanup (#1370)
* reorganize

* math64

* rcp_utils

* osSyncPrintfUnused

* comment spacing
2023-09-12 10:38:31 +10:00
MegaIDK 81424208e6 document object_zov (lulu the zora vocalist) (#1357)
* initial commit of object_zov documentation

* morphFrames and mouth name change

* sAnimations array name instead of sAnimationInfo

* forgor format

* separate categories
2023-09-11 15:27:23 +10:00
angie b0c49f51c2 yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL 2023-09-03 19:33:54 -03:00
angie f8719bad77 yeet hardware.h 2023-09-03 19:25:24 -03:00
angie db60759a48 final io chunk 2023-09-03 19:07:13 -03:00
angie 17e3264c3c another io chunk 2023-09-03 18:47:05 -03:00
angie f8bb3c248b various io files 2023-09-03 18:03:11 -03:00
angie bc35674ed3 cleanup osVirtualToPhysical 2023-09-03 17:22:26 -03:00
angie 6004a2e238 cleanup a lot of os files 2023-09-03 17:18:23 -03:00
angie d3081239d3 hardwareinterrupt 2023-09-03 16:01:04 -03:00
angie ec1e7a0f5e some os files 2023-09-03 15:56:25 -03:00
angie 1bf2fbaf79 yeet rmon, do libc files 2023-09-03 15:48:17 -03:00
angie b3730be07a vimodes 2023-09-03 15:42:23 -03:00
angie 0e964249a6 cleanup gu 2023-09-03 15:17:36 -03:00
angie a0df00d0cc rename osFlash symbols 2023-09-03 15:08:25 -03:00
angie 70d92f7383 migrate pimgr data and cleanup on initialize.c 2023-09-02 22:13:19 -04:00
angie 1c99c9b5f5 OS_PHYSICAL_TO_K0 and other cleanups 2023-09-02 21:51:19 -04:00
angie 4dfe7235b8 yeet HW_REG 2023-09-02 19:08:19 -04:00
angie 3bd7a84c1c more cleanup 2023-09-02 18:40:54 -04:00
angie 749c2674d4 more variables 2023-09-02 17:25:22 -04:00
angie fcccb050b3 various variables 2023-09-02 16:51:11 -04:00
angie 30710d7da2 os symbols 2023-09-02 16:10:34 -04:00
Anghelo Carvajal 4fa13e4132 Move libultra function declarations to libultra headers (#1196)
* Delete unused headers

* Move PR and io to ultra64

* move headers to ultra64

* more cleanups

* more reorganizing

* i think that should be all

* format

* ifdef guards cleanup

* Add IO_READ and IO_WRITE macros for future use

* warnings

* review

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

* warnings again

* warn

* ifdef guards

* fix merge

* fix merge

* fix merge

* bss

* padutils.h

* bss

* bss

* bss

* fix merge

* bss

* bss

* bss

* fix merge

* fixes

* fixes

* bss

* bss

* fix merge

* fix

* fix

* fix includepaths

* fix paths

* bss

* fix

* ultra64/ -> PR/

* header guards

* fix ehader guards

* fix

* fix++

* format

* bss is borken

* prevent 2

* :despair:

* bss

* rename assert to dbg_hungup

* fix

* a

* fix

* bss

* fix

* bss

* bss

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2023-09-02 15:34:29 -04:00
Anghelo Carvajal 9cceea48f3 Documentation pass for the Target system (#1281)
* cleanup

* import bss

* sActorHiliteMtx

* some cleanups on func_800BB604

* Actor_IsInTargetableRange

* rematch func_800BB604

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* Name ACTOR_FLAG_UNFRIENDLY and ACTOR_FLAG_FRIENDLY

* Rename some Target_ functions

* cleanusp

* TargetMode enum

* Target_800B82EC

* sNaming

* more

* more naming

* fairyHintPos

* rotation

* ACTOR_FLAG_TARGETABLE

* update namefixer

* remove trailing comma

* bss

* Wall of text for Target_800BB604

* function naming

* cleanups

* Target_GetAdjustedDistSq

* NotLeash

* more comments

* minor comment

* review

* fix

* rotZTick

* review

* name last members

* fix

* review

* review

* more namefixer

* swap members

* comment

* Update src/code/z_actor.c

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

* Update src/code/z_actor.c

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

* review

* format

* Update src/code/z_actor.c

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

* Update include/z64actor.h

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

* review

* review

* fix

* fix

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-09-02 15:16:45 -04:00
MegaIDK 108b482ad0 document remaining door assets (#1351)
* initial commit of remaining door asset documentation

* format

* forgor the g removed comments

* space in metal door desc

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

* space in spider door dsc

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-22 12:09:19 +10:00
Derek Hensley 8059537150 Game bss and cleanup (#1356)
* Game bss and cleanup

* Match Oot with rdp time variables

* PR review

* Namefixer
2023-08-21 21:44:28 -04:00
Derek Hensley 312fcafe2d Small General cleanup (#1360)
* Draw things

* EffectSsFhgFlash_SpawnShock enum

* gohtIndex

* colliders

* ObjGhaka_Init

* func_80B3C39C

* undef syms
2023-08-20 18:50:55 +10:00
Isghj c5d6185a88 En_Horse_Link_Child and object_horse_link_child partially documented. (#1353)
* ChildHorse: some documentation

* OOT Horse: more documentation

* OOT Horse: more documentation

* OOT Horse: more documentation

* might be busted

* OOT Epona: more documents aft

* OOT Epona: some object documentation, continued documentation

* format

* OOT Epona: requested changes

* OOT Epona: minor documentation changes

* what is this warning, c pls

* OOT Horse: git nudge

* OOT Epona: requested changes to enums

* OOT Epona: Anim

* Update src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c

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

* OOT Epona: change enum name

* OOT Epona: Requested changes

* OOT Epona: More requested changes

* OOT Epona: removed incorrect padding guess

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 14:59:51 +10:00
engineer124 0cceee6eba Animation Cleanup: En_C* and En_D* Actors (#1327)
* En_C cleanup

* En_D

* more cleanup

* name enums

* missed one

* PR Review

* remove padding
2023-08-15 14:23:33 +10:00
Synray 33ca9daece z_bgcheck OK (#1358)
* z_bgcheck OK

* Format

* Cleanup

* Cleanup

* Review changes

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 13:58:49 +10:00
MegaIDK ef51974049 document object_mkk (#1350)
* initial commit of object_mkk documentation

* forgot door

* spaces

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 11:34:57 +10:00
MegaIDK 09100194b3 document object_hana (graveyard flower) (#1355)
* initial commit object_hana documentation

* explain how object is organized

* change whole flower set name

* a litle space

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 10:44:53 +10:00
MegaIDK 17b7f3f90e document object_tsubo, object_racetsubo and object_obj_chan (#1346)
* initial commit of object_tsubo, object_racetsubo and object_obj_chan documentation

* little description in chandelier xml

* desc between root and file

* changed green pot to race pot

* changed race pot to magic pot

* space in desc

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-08-15 10:34:52 +10:00
Blythe f0ca606cd2 object_bal & EnBal OK and documented (#1317)
* object_bal and z_en_bal initial push

* Formatting, updated named audio funcs

* Cleanup, labeled some week events

* trying to fix merge issues

* Merge, misc cleanup

* Fix buildability after merge

* Fixed formatting issues

* static variable name fixes

* Cleanup & object item renames

* Formatting

* Additional name cleanup

* Name & comment tidying

* Updated function names referenced by EnBal
2023-08-14 11:38:33 -04:00
engineer124 affb1eaf0f Body Parts Docs (#1333)
* body parts WIP

* continue WIP

* finish body parts

* cleanup

* missed one

* Missed Enum

* PR Review

* next PR review

* s32 cast

* TRUNCF_BINANG

* rm unnecessary shadow

* PR Review

* missed some

* oops
2023-08-14 10:08:45 -04:00
gamestabled a6a94e543c EnMnk OK and partially documented. handing off to the next ape enthusiast (#1277)
* EnMnk OK and partially documented. handing off to the next ape enthusiast

* run format.py

* fix trailing comma warning

* Monkey PR Review (#1)

* PR Review

* a little more

* oops

* Reordering Monkey, anim

* cleanup, typos

* More PR Suggestions

* namefixer

* fix master

* limbIndex

* PR Review

---------

Co-authored-by: gamestabled <gamestabled@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-08-12 12:15:14 -04:00
Anghelo Carvajal 656fd08ee8 Gamestate table (#1354)
* gamestate_table.h

* move macros

* bss

* format
2023-08-12 11:44:35 -04:00
Tom Overton 138dd55662 Document object_tl (Snapper) (#1349)
* Document object_tl (Snapper)

* Rename skelAnimes/jointTables/morphTables
2023-08-12 17:31:46 +10:00
MegaIDK c4c7ca9f61 document object_dinofos (#1343)
* initial commit of object_dinofos documentation

* forgot to format

* dinolfoslimb

* eye texturs

* desc position and eye tex name change

* forgor the rest

* removed object .h from .c #includes
2023-08-12 13:35:43 +10:00