mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-24 00:25:48 +00:00
Code Issues Projects Releases Wiki Activity
2150 commits 1 branch 0 tags 530 MiB
Commit graph

2150 commits

This branch
This branch
All branches
Author SHA1 Message Date
krm01
0a48348f8d
doc for menkuri_eye (#1580) 2023-11-14 14:20:23 -05:00
Dragorn421
4c75260097
Fix misc 21 (#1573) 
* Make `sNew` in (unused) `code_800FC620.c` a string

It is passed as a filename to `__osMallocDebug` so should be a nul-terminated string, not a char[3] missing an explicit \0

* Fix gcc warning in `JpegDecoder_ParseNextSymbol` about SLL on negative value

-1U is an unsigned value, aka 0xFFFFFFFF
I keep -1 because it seems that's what a jpeg standard has too

References:
https://stackoverflow.com/questions/40508958/shifting-a-negative-signed-value-is-undefined
https://www.w3.org/Graphics/JPEG/itu-t81.pdf (page 105, figure F.12)

* Small cleanup

* Fix few mistakes (thanks gcc warnings)

* Add `@bug` in file select settings draw code, using the wrong array

* format

* format main

* rename arg for a happy formatter

* Move important function call out of a printf
 2023-11-12 16:59:52 -05:00
Javarooster
dc323052c3
Changed gLinkChildSlinghotStringDL to gLinkChildSlingshotStringDL (#1576) 2023-11-12 00:01:55 +01:00
fig02
836adb83ea
Rename "ITEM_LAST_USED" (#1572) 
* rename

* format

* remove formatter changes

* change model group comments
 2023-11-07 14:11:59 -05:00
Dragorn421
4b1f978ce6
investigated significance of garbage cursor position in magic arrows equips (result: none) 2023-11-04 22:31:28 +01:00
Dragorn421
4f312782c5
Merge remote-tracking branch 'origin/doc_pause_menu' into doc_pause_menu 2023-11-04 21:45:41 +01:00
Dragorn421
ae8034422e
Merge branch 'main' into doc_pause_menu 2023-11-04 21:38:33 +01:00
Dragorn421
6b87848b71
Merge commit 'fefeb369dd19172d5eb419f8c8373cfb10d59d19' into doc_pause_menu 2023-11-04 21:38:05 +01:00
Dragorn421
0e32070789
Merge commit 'c73e2ab72618b01c96f63868a8f1001e86eaa461' into doc_pause_menu 2023-11-04 21:30:20 +01:00
fig02
042a5c5530
rename to upper action (#1570) 2023-11-04 02:59:12 -04:00
Dragorn421
8718a5c8c0
Remove (ActorFunc) casts in initvars (#1571) 
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format

Achieved by using the following regex:

(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)

replaced with

$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19

plus a change from /**/ to #if 0 #endif in docs/

* Manual fixes
 2023-10-30 10:19:16 -04:00
fig02
4908b8b37c
Player Docs: public facing csAction things (#1561) 
* name public csAction functions

* format

* adjust function comment

* format
 2023-10-28 07:46:24 -04:00
Tharo
3475651701
libc cleanup (#1568) 
* libc cleanup

* Suggested changes, small alloca tweak

* Remove printf include
 2023-10-27 16:06:44 +02:00
Dragorn421
4e55168eaa
Update ZAPD (#1569) 
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "094e79734"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "094e79734"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Add EnumData.xml where some names are now externalized

* Remove legacy typedefs for zapd, no longer needed!
 2023-10-24 21:36:10 -04:00
Tharo
503f6d86d5
Track most header dependencies for include/tables headers (#1566) 
* Makefile automatically rebuild source files including headers from include/tables

* Fix typo, make z_actor.c also depend on actor_table.h

* Add message data dependencies for z_message_PAL, adjust comments
 2023-10-20 19:14:52 +02:00
Tharo
a20163c6ab
Use long over int for s32/u32 types (#1546) 
* long s32

* Suggested changes
 2023-10-17 21:16:31 +02:00
cadmic
b3486b57ef
Rename Math3D_CylOutsideCyl and Math3D_CylOutsideCylDist (#1557) 
* Rename Math3D_CylOutsideCyl and Math3D_CylOutsideCylDist

* radix -> radii

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

* Make Math3D sphere/cylinder collision check function names more consistent

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
 2023-10-07 19:42:28 -04:00
fig02
181b438393
Player Docs: Propose Named Unions For Shared Variables (#1560) 
* make unions

* format

* adjust comment on halt thing
 2023-10-07 19:25:45 -04:00
fig02
ebc6ebf232
Player Docs: Initial AnimSfx stuff (#1556) 
* initial animsfx docs

* review

* extra space
 2023-10-05 10:22:40 -04:00
engineer124
c39578f971
Introduce Player CueIds (#1559) 
* cueId

* cleanup
 2023-10-05 10:04:41 -04:00
fig02
c5e4357127
initial action-change-list docs (#1540) 2023-09-27 11:02:21 -04: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
engineer124
873c55faad
Improve Matches: Part 4 (#1545) 
* more improvements

* small cleanup

* PR Review
 2023-09-24 17:51:03 +02:00
Dragorn421
16dabb1970
Merge branch 'main' into doc_pause_menu 2023-09-22 22:50:40 +02:00
Dragorn421
27bdb37d62
Merge branch 'main' (early part) into doc_pause_menu 2023-09-22 22:43:00 +02:00
Dragorn421
b4a70236b8
Merge branch 'main' (early part) into doc_pause_menu 2023-09-22 22:42:54 +02:00
Dragorn421
a2c5d8f304
Merge branch 'main' (early part) into doc_pause_menu 2023-09-22 22:40:46 +02:00
Dragorn421
7adb6236ee
minor things/notes 2023-09-22 22:39:24 +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
Nuss
4842f62833
wrong path (#1548) 2023-09-22 12:13:26 -04:00
Dragorn421
c73e2ab726
Make macros for age reqs data and access (#1549) 
* Make macros for age reqs data and access

* line breaks for readability
 2023-09-22 11:50:44 -04:00
Derek Hensley
dc010abf7a
Rename master to main (#1536) 
* Jenkinsfile master -> main

* Missed some instances of master
 2023-09-22 11:40:19 -04:00
Dragorn421
d43613694c
Merge branch 'master' into doc_pause_menu 2023-09-20 21:50:15 +02:00
Dragorn421
74b74eb006
Merge commit 'd314cfe92395172612676a8ad007a0639c8d5666' into doc_pause_menu 2023-09-20 21:49:59 +02:00
Dragorn421
6b3e8d46cd
Merge commit 'd314cfe92395172612676a8ad007a0639c8d5666^' into doc_pause_menu 2023-09-20 18:49:54 +02:00
engineer124
d7f6961918
Improve Matches: Part 3 (#1544) 
* improve matchings

* spacing
 2023-09-20 12:41:47 -04:00
engineer124
72334df180
improve matching (#1543) 2023-09-20 10:54:44 -04:00
engineer124
a8d670fe5c
improve matches (#1542) 2023-09-20 10:41:03 -04: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
Dragorn421
185c9cbf1a
Run formatter (#1541) 2023-09-19 15:01:00 -04: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
83a13a64c7
Document niche magic spell bug (#1526) 
* document magic spell bug

* Update src/overlays/actors/ovl_player_actor/z_player.c

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

* adjust comment

* fix renamed func and reformat

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
 2023-09-19 13:23:56 -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
Yanis42
239a172114
remove the extra `CS_CMD_STOP` (#1535) 2023-09-14 18:41:10 -04:00