Commit Graph

908 Commits

Author SHA1 Message Date
Yanis42
4600db0967 mbi oddity 2023-10-14 19:49:48 +02:00
Yanis42
fbfe1b6714 final change 2023-10-14 18:01:28 +02:00
Yanis42
8870816147 ifdefs part 1 2023-10-14 17:11:35 +02:00
Yanis42
0238c183c6 Merge remote-tracking branch 'upstream/dev' into syncs 2023-10-14 16:40:47 +02:00
Yanis42
b898156aa0 Merge remote-tracking branch 'upstream/main' into dev 2023-10-13 19:06:33 +02:00
Yanis42
9449a4c071 Merge remote-tracking branch 'decomp/main' into decomp_merge 2023-09-27 17:31:53 +02:00
fig02
2cb4ff4fd3 Player Docs: csMode -> csAction (#1547)
* csmode -> cs action

* format
2023-09-26 12:48:41 -04:00
Tharo
092f602638 Fix gamestate overlay table size declaration (#1555) 2023-09-26 08:40:55 -04:00
Derek Hensley
4d7558df0d Speedmeter Small cleanup (#1554)
* Small cleanup

* x
2023-09-25 06:29:15 -04:00
Yanis42
cb1c2ffa09 Merge remote-tracking branch 'decomp/main' into decomp_merge 2023-09-23 13:29:15 +02:00
Yanis42
bdd34a34d3 Merge remote-tracking branch 'upstream/main' into decomp_merge 2023-09-23 13:19:14 +02:00
Dragorn421
fefeb369dd Name the main pause state and add placeholder enum for main (sub)states (#1551) 2023-09-22 14:48:09 -04:00
Yanis42
a6f5c92b3f thing 2023-09-21 15:19:47 +02:00
Billy
107c0288cc Dekunut Salesman Docs (#1493)
* Dekunut Salesman Docs

* Update src/overlays/actors/ovl_En_Dns/z_en_dns.c

Remove extra param from debug logging

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* * Full Deku/Potion name usage
* Dialog -> CanBuy
* Revert debug logging symbols
* Proper declaration spacing
* Fix en_shopnuts header doc
* Biz -> Business

* Fix missed deku prefix's

* Synchronize CanBuy sticks and nuts

* Fix enum naming

* Clarified CanBuy success values

* anon review

* fig review

* macro changes

* fix macro usage

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2023-09-19 21:41:42 -04:00
fig02
da3f4718f0 Player docs: Control Stick Input and Movement (#1539)
* document input stuff and movement speed+yaw

* curve -> curved, and other cleanups

* fix + format

* function declaration

* name arguments

* add mode descriptions

* fix typos

* move comment down
2023-09-19 21:37:03 -04:00
Yanis42
9ccbc431ea Merge remote-tracking branch 'decomp/master' into decomp_merge 2023-09-19 20:51:56 +02:00
Dragorn421
57ce0cf8d9 Doc/Cleanup pass on object handling (#1227)
* `Object_InitBank` -> `Object_InitContext`

* Add and use `OBJECT_SPACE_SIZE_BASE`

* Remove `OBJECT_EXCHANGE_BANK_MAX` -> use `ARRAY_COUNT()` instead

* "object status" -> "object load entry"

* Misc. cleanup/renames

* Partial docs and way too much batch renaming and cleanup for a single commit

* ctrl shift h

* format

* format clang-11.1

* fix regressions

* Improve a `@bug` comment

* Move `OBJECT_SPACE_SIZE_BASE` from header to near `Object_InitContext`

* "objectID" -> "objectId"

* Revert iterator index to `i` in `Actor_KillActorsWithUnloadedObject`

* "object load entry index" -> "object entry"

* `Object_UpdateLoadEntries` -> `Object_UpdateEntries`

* Run format.sh

* "object entry" -> "object slot" (except internal usage)

* Proper `Object_SpawnPersistent` doc

Co-authored-by: fig02 <fig02srl@gmail.com>

* fixup one comment "object bank index" -> "object slot"

* Amend `Object_SpawnPersistent` comment to mention running out of free slots

* `Actor_KillActorsWithUnloadedObject` -> `Actor_KillAllWithMissingObject`

* Remove useless mention of what uses `Object_SpawnPersistent`

* Fix mistake on `Object_SpawnPersistent` doing sync dma, not async

* run formatter

* `Object_InitContext` -> `Object_Init`

* `waitObjectSlot` -> `requiredObjectSlot`

* `Object_Init` -> `func_80097DD8`

* one objectIndex -> objectSlot

* Remove `OBJECT_SPACE_SIZE_BASE`

* light fix on the merge (rm OBJECT_EXCHANGE_BANK_MAX)

* `func_80097DD8` -> `Object_InitContext`

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2023-09-19 14:10:12 -04:00
fig02
5170f2de17 Start Player Item Docs (#1523)
* item docs

* format

* loop change

* some of engineers review

* shorten comment (thanks formatter)

* ProcessItemButtons

* true/false
2023-09-18 00:08:43 -04:00
fig02
6c3e8d63cf Name player's generic actionVars (#1538)
* name player generic vars

* format
2023-09-17 19:56:41 -04:00
fig02
ba07f21e9d Change player struct variable spacing (#1537)
* change spacing

* missed something

* missed another

* and another lol
2023-09-16 22:25:56 -04:00
Tharo
9b207c356a Document Framebuffer Filters, VisCvg and VisZbuf (#1534)
* Document z_viscvg and z_viszbuf

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

* Few more notes

* Some more notes

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

* Review

* Americanisation, FB RGB

* Oops

* Review

* Minor documentation modifications

* Header, base struct and enums

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

* functions.h fix

* Suggested changes, further adjustments to file doc comments

* Further suggested changes, standardize capitalization of gfxP

* g

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-09-16 17:16:58 -04:00
fig02
823e47a0f8 Player Docs: Name actionFunc (#1531)
* progress, going to merge master

* merge master

* finish renmaing functions

* reorder declarations
2023-09-13 20:34:07 -04:00
Yanis42
ed78676d09 initial cleanup 2023-09-12 16:42:21 +02:00
Yanis42
a83640f4d2 Merge remote-tracking branch 'upstream/dev' into syncs 2023-09-12 15:50:47 +02:00
Yanis42
3de5821c14 fix issues and add ares' bs* files to gitignore 2023-09-10 16:38:15 +02:00