Commit Graph

717 Commits

Author SHA1 Message Date
angie f8d62d670f SEGMENTED_TO_K0 2023-09-25 15:32:46 -03:00
angie c734cce6f0 review 2023-09-23 13:51:08 -03:00
angie 19758812b3 review 2023-09-20 10:39:56 -03:00
angie bf960bf288 brief explanation 2023-09-19 16:19:24 -03:00
angie a679b6bae4 fixes and format 2023-09-19 16:11:51 -03:00
angie 48fe9d0f46 fix merge 2023-09-19 15:32:30 -03:00
angie 24aea7cafd Merge remote-tracking branch 'upstream/master' into ultracleanup2 2023-09-19 14:58:45 -03: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
Derek Hensley 190b78549e
Non libultra Boot Cleanup (#1370)
* reorganize

* math64

* rcp_utils

* osSyncPrintfUnused

* comment spacing
2023-09-12 10:38:31 +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 f8bb3c248b various io files 2023-09-03 18:03:11 -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 b3730be07a vimodes 2023-09-03 15:42:23 -03:00
angie b2bcdce978 Rename r4300.h 2023-09-02 21:55:36 -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
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
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
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
engineer124 05c2221769
Audio Load and Heap Headers (#1329)
* more header splits

* cleanup

* adjust comments
2023-08-12 12:33:58 -04:00
Anghelo Carvajal 656fd08ee8
Gamestate table (#1354)
* gamestate_table.h

* move macros

* bss

* format
2023-08-12 11:44:35 -04:00
Anghelo Carvajal d107b6c2a9
`z64vi*.h` and `sys_cfb.h` headers (#1259)
* z64vimode.h

* z64viscvg.h

* z64vis*.h

* VisCvg

* sys_cfb.h

* a bit of naming

* review

* Renames

* bss

* fix

* bss

* bss

* bss

* messed up the merge

* bss is borken

* reordering 2

* remove prevent header from fault.c
2023-08-09 19:44:31 -04:00
engineer124 17b774effe
Animation Cleanup: En_F* (#1332)
* Anim F Cleanup

* minifrog

* cleanup

* more cleanup

* cleanup fishing limb

* format

* spacing

* PR Review
2023-08-06 10:02:37 -04:00
engineer124 4ae00e909e
Fix Cutscene Bss (#1305)
* demo bss

* fix bss

* sPad

* also matching

* static bss pad

* ultratypes

* spacing

* cleanup
2023-08-04 16:36:03 -04:00
Derek Hensley 410d412d0a
Talk Exchange System Docs (#1312)
* Fix typo

* PLAYER_IA_HELD

* Actor offer exchange item functions

* SubS_OfferExchangeItemCustom

* SubS_OfferItem + enum

* Actors that use Subs_OfferItem

* SubS_OfferExchangeItemFacing

* Comments

* Format

* Better comment

* EnRg

* function names and comments

* Split enum

* exchangeItemId -> exchangeItemAction

* namefixer

* PR comments

* Missed a comment

* Max -> Mask

* SubS_SetOfferMode

* Some more comments updating

* rg comment

* PLAYER_IA_CONTINUE

* Revert back to PLAYER_IA_MINUS1

* Comment typos/grammar

* Verify functions

* yawRange

* Actor_OfferTalkNearby

* Actor_OfferTalkExchangeEquiCylinder

* format

* Actor_OfferTalkNearColChkInfoCylinder

* OfferTalk comments

* Actor_OfferTalkExchange comment enum

* format
2023-08-01 09:40:12 +10:00
Derek Hensley 9e85f5545a
Shopkeeper weekeventregs (#1325)
* Ossan

* sob1 talked

* fsn weekeventregs

* Curiosity shop 3rd day item to special item

* Kotake

* Format

* Kotake bottle

* PR suggestions

* Koume Kiosk -> Kiosk Koume

* Update include/z64save.h

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

---------

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-18 14:51:56 -04:00
engineer124 6d94e0ce9b
ClearTag Params Cleanup (#1308)
* clearTag params

* header ordering

* brackets

* cleanup

* add note
2023-07-14 14:56:08 -04:00
Derek Hensley 913cd981c0
Deku Playground Docs (#1318)
* Actor shared memory

* EnGameLupy

* EnLiftNuts

* object_dnt

* PR Suggestions

* Things I missed

* sPad

* Format

* PR comments
2023-07-10 22:47:39 -04:00
engineer124 db6268a12e
Template Docs For Player Action (#1279)
* generic action names

* more docs

* add comment

* more renaming

* do nothing

* another rename

* Swap Init

* simplify name

* more cleanup

* setup

* deku stick

* PR Review

* rm comment

* missed some
2023-07-10 19:28:25 -04:00
Tom Overton 7cbd63c33d
Provide original sequence names for all BGM and rename some sequences (#1311)
* Provide original sequence names for all BGM and rename some sequences

* Include official soundtrack names, respond to reviews, rename some more sequences based on new evidence

* Forgot to rename the shooting gallery sequence, oops

* Rephrase the comment on NA_BGM_CLOCK_TOWN_MAIN_SEQUENCE
2023-07-10 18:30:21 -04:00
engineer124 82318a1c1b
Animation Cleanup Part 1: Dm Actors (#1290)
* DM cleanup

* cleanup

* fix pointer

* rm unused anim enum

* PR Suggestions

* spacing

* missed one

* More PR Suggestions

* oops
2023-07-10 10:00:42 -04:00
Anghelo Carvajal b3eae0e5b7
Port OoT's docs for `fault.c` and `fault_drawer.c` (#1199)
* fault.h

* some docs stealing

* fix building

* fault_internal.h

* pass

* finish stealing docs

* finish cleanup

* format

* warning

* Update src/boot_O2_g3/fault.c

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

* Update src/boot_O2_g3/fault.c

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

* Update src/boot_O2_g3/fault.c

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

* review

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

* arggggg

* arggggg part 2

* STACK

* PHYS_TO_K0(0x400000)

* format

* fix

* Instance

* format

* Neutral reset

* variables.h cleanup

* bss

* frameBuffer

* format

* Update src/boot_O2_g3/fault.c

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

* review

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

* Update src/boot_O2_g3/fault.c

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

* bss

* bss

* bss

* callback cleanup

* fix function declarations

* fix again

* bss

* bss

* Update src/overlays/actors/ovl_En_Fishing/z_en_fishing.c

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

* Update src/boot_O2_g3/fault.c

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

* bss

* bss

* Update src/boot_O2_g3/fault.c

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

* review

* import bss

* format

* minor cleanup

* bss

* review

* fix

* bss

* bss

* bss

* bss

* bss

* format

* a

* Z_PRIORITY_FAULT

* bss

* fix

* idle.c bss doesn't want to get fixed :c

* review

* bss

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-08 14:41:25 -04:00
Derek Hensley a506e8620a
Fidget Tables Docs (#1316)
* Docs for SubS_FillLimbRotTables and Actor_FillLimbRotTables

* Fidget

* Format

* ///

* UpdateFidgetTables

* Clarify comment

* Adjust comments slightly

* Update src/code/z_actor.c

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

* Update src/code/z_sub_s.c

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-07 07:54:43 +10:00
engineer124 857a0cfdaf
`item_name_static` documented and `ItemId` updates (#1304)
* WIP

* map static

* finish english names

* jpn

* revert map name

* name prefix

* boss to big

* more comments

* item enums

* more items

* more

* PR Suggestions

* PR Suggestion
2023-07-04 09:52:36 -04:00
engineer124 0f572acbda
`map_static_name` docs (#1298)
* map static docs

* adjust comment

* improve comments

* PR Suggestions

* map point

* adjust comments
2023-07-04 17:58:02 +10:00
louist103 0c4f2524d8
Obj_wind (#1309)
* Initial decomp done

* Matched

* format

* PR Fixes

* Fixes

* Fixes

* Update src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c

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

* new names

* Format

---------

Co-authored-by: louist103 <louist103@pop-os.localdomain>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-07-04 17:44:57 +10:00
Stuff is on GitLab 5fd8afd1db
fix: wrong offset-comments in GraphicsContext (#1314)
* fix: wrong offset-comments in GraphicsContext

* fix: match gfx member names to offsets
2023-07-03 20:38:15 +10:00
Derek Hensley 22035890fa
Idle + Main bss and cleanup (#1292)
* Idle bss and cleanup

* main bss and cleanup

* format

* Remove pad comment about sAudioMgr

* PR

* Missed a couple size_t changes

* unused pads

* static
2023-06-26 10:18:50 +10:00