71d0f4e050
review
2023-09-20 10:57:22 -03:00
19758812b3
review
2023-09-20 10:39:56 -03:00
24aea7cafd
Merge remote-tracking branch 'upstream/master' into ultracleanup2
2023-09-19 14:58:45 -03:00
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
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
57501ed415
`z_obj_tokei_tobira` OK undocumented ( #1336 )
...
* Fixes
* `z_obj_tokei_tobira` OK undocumented
* Revert "Fixes"
This reverts commit b3358254df
2023-09-15 00:39:21 -03:00
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
190b78549e
Non libultra Boot Cleanup ( #1370 )
...
* reorganize
* math64
* rcp_utils
* osSyncPrintfUnused
* comment spacing
2023-09-12 10:38:31 +10:00
c8304925da
Subrepo Updates ( #1368 )
...
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "fed1e3ddb"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "fed1e3ddb"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "4ed847317"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "4ed847317"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "7f398831f"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "7f398831f"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull (merge) --force tools/fado
subrepo:
subdir: "tools/fado"
merged: "8ce048376"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8ce048376"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
2023-09-08 20:17:54 +10:00
b0c49f51c2
yeet PHYSICAL_TO_VIRTUAL and VIRTUAL_TO_PHYSICAL
2023-09-03 19:33:54 -03:00
f8bb3c248b
various io files
2023-09-03 18:03:11 -03:00
6004a2e238
cleanup a lot of os files
2023-09-03 17:18:23 -03:00
b3730be07a
vimodes
2023-09-03 15:42:23 -03:00
0e964249a6
cleanup gu
2023-09-03 15:17:36 -03:00
70d92f7383
migrate pimgr data and cleanup on initialize.c
2023-09-02 22:13:19 -04:00
749c2674d4
more variables
2023-09-02 17:25:22 -04:00
fcccb050b3
various variables
2023-09-02 16:51:11 -04:00
30710d7da2
os symbols
2023-09-02 16:10:34 -04:00
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
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
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
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
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
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
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
93dbe1a02a
Tools: add assets/xml folder to rename_sym.sh directories
2023-08-12 15:37:04 +10:00
2f1996a526
Animation Cleanup: En_E* ( #1331 )
...
* begin E
* more cleanup
* limb index
* small cleanup
* format
* PR Review
* sLimbToBodyParts
* more bodypart cleanup
2023-08-10 21:26:29 -04:00
e1e30586c9
Fix first_diff and sym_info for older and new ld ( #1342 )
...
* Fix map parsing for ld >= 2.40
* mapfile_parser
* Paths
* mapfile_parser requirement
* Move tools back
* Comment
* Add ability to decode instructions for first_diff
* import error for mapfile_parser
* PR comments from OOT
* ,s
2023-08-10 20:58:20 -04:00
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
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
27ccadc77e
Document the function that handles the Giant's Mask cutscene in Boss02 ( #1345 )
...
* Document the function that handles the Giant's Mask cutscene in Boss02
* Remove newline between fallthrough and next case
2023-08-04 13:06:36 +10:00
fa30dea28d
namefixer.py hotfix ( #1347 )
...
* namefixer hotfix
* Actor_OfferTalkExchangeEquiCylinder
2023-08-01 09:55:14 -04:00
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
bbfbc4073e
Update ZAPD subrepo ( #1338 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "cb0342425"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "cb0342425"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "505024b33"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "505024b33"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* Disable Wno-hardcoded-pointer for `make assets`
2023-07-28 18:20:12 -04:00
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
b3f4b8a9cb
Animation Cleanup: En_B* Actors ( #1326 )
...
* En_B
* more cleanup
* another if (1) fixed
* more cleanup
* more cleanup
* rot
* PR Suggestions
* fix vtx
* rm more Draw
* Update assets/xml/objects/object_yb.xml
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* Update assets/xml/objects/object_bigpo.xml
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
---------
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-07-14 16:33:58 -04:00
e7f3921414
Animation Cleanup Part 2: En_A* Actors ( #1322 )
...
* en_A
* more cleanup
* more cleanup
* another one
* more cleanup
* Suggestion
* Oops
2023-07-12 22:08:56 -04:00
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
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
08006cc0ea
Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena) ( #1319 )
...
* Document EnTanron5 (destructible props, fragments, and item drops in Twinmold's arena)
* Respond to engineer's review
* Updated the type names, used "ruin" instead of "prop" in comments, and addressed Anon's review
* Missed this instance of "prop"
* Respond to engineer's review
* Update OutNames too
2023-07-10 18:02:22 -04:00
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
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
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
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
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
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
a2c2c45a0e
Import some bss ( #1301 )
...
* flg_set
* EnItem00
* pad_801DC9C0
* EventMgr
* sPad
* files.txt
* const s32 sPad
2023-06-25 19:49:39 -04:00
541199888c
Setup for Player Cutscene Docs ( #1270 )
...
* player cs docs setup
* more docs
* more docs
* missed enums
* more docs, but broken. Need to fix sPlayerCsModeAnimFuncs
* fix
* rm enum
* more minor docs
* PR suggestion
* typo
* csActionFunc
* PR Suggestion
* fix bss
* fix bss
2023-06-25 08:33:22 -04:00
21655f31c5
Audio Effects Cleanup ( #1295 )
...
* audio effects cleanup
* more cleanup
* header comments
* more docs
* cleanup
* file name fix
* swap if
* more cleanup
* move comment
* ADSR notes
* fix bss, pr review
2023-06-24 19:56:48 -04:00
9b341a4d6a
A few UB fixes ( #1272 )
...
* Fix OoB in ObjDriftie
* Fix OoB in EnHorseLinkChild
* Fix negative shift in jpegdecode
* more oob fixes
* AVOID_UB
* clean
* huh?
* change viint.h macros
* objdriftice
* ub labelling
* review
* review
* fix z_parameter arrays
* u32 cast
* missing &
2023-06-24 18:40:26 +10:00
angie