1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 07:51:48 +00:00
Commit graph

2386 commits

Author SHA1 Message Date
mracsys
bdc774058d
More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311)
* rename CS_BEGIN_CUTSCENE and CS_END

* matching

* naming consistency for END command, improved comments

* remove CS_CMD_NONE

Co-authored-by: mzxrules <mzxrules@gmail.com>

* remove comma from end of enum

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c04562d30"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c04562d30"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cce3d93"

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-12-02 16:50:58 -05:00
Tharo
3f703a39d9
Fix some more GCC warnings, mark some bugs based on GCC warnings (#2309)
* Fix some more GCC warnings, mark some bugs based on GCC warnings

* Weird formatting

* Suggested changes

* More weird indentation I guess

* UNREACHABLE() macro, add missing NORETURNs to fault_n64.c

* AVOID_UB for PAL path in z_file_nameset.c

* Remove comments about return types

* Remove temp no longer needed
2024-12-02 04:40:49 -05:00
engineer124
6199634ffb
Minor Cleanup (#2308)
* cleanup

* more

* fix floats
2024-12-01 07:55:50 -05:00
mracsys
e0bd123312
Document time-specific textures for Deku Tree and Gerudo Fortress similar to other scenes (#2310)
* rename time-specific scene file textures

* linter fixes
2024-11-30 13:56:59 -05:00
feacur
bdf44ffc97 Merge branch 'main' into doc/actor_goron 2024-11-28 09:30:28 +01:00
fig02
cddca30442
Player Docs: Document Some Start Mode Actions (#2305)
* document blue warp arrive

* document warp song, door, and time travel

* document grotto and farores wind

* move animsfx

* review

* unname appear
2024-11-27 21:19:53 -05:00
Leonid Kapitonov
53962a2cd8
Document Actor "Fidget Tables" (#2287)
* Document `func_80034F54` and related data

new name: `UpdateLimbOverrides`
reason:
- `0x814` and `0x940` constants
- `*_OverrideLimbDraw` functions

additionally:
- move constants into `z64animation.h`
- use these constant for existing formulas
- properly name corresponding actors' fields
- add occasional explicit limbs limit constants

* port over the MM "fidget" naming

* remove redundant comments
* move and rename `FIDGET_*` constants
* introduce a `FIDGET_SCALE` constant, as no other value is applied

* remove generally unrelated changes

* apply PR suggestion

Co-authored-by: mzxrules <mzxrules@gmail.com>

* fix (?) fidgetTable size

following the https://github.com/zeldaret/oot/pull/2287#discussion_r1832371833 suggestion

* remove an unused `struct EnMu` field @ `0x024A`

a continuation to the 211263295c
automatic padding commpensates its absence

* remove MM mention as "it would get unruly fast"

https://github.com/zeldaret/oot/pull/2287#discussion_r1833470468

* rename `overridePerLimb` -> `fidgetFrequency`

https://github.com/zeldaret/oot/pull/2287#discussion_r1837211873

* give better names to the constants

https://github.com/zeldaret/oot/pull/2287#discussion_r1837211873

* remove unnecesasry braces from a comment

https://github.com/zeldaret/oot/pull/2287#discussion_r1842642196

* make the comment multiline "officially"

* restore `limbIndex` naming for this PR

43afb7b7cb (r1842644602)

* apply a PR suggestion

https://github.com/zeldaret/oot/pull/2287#discussion_r1842787653

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
2024-11-27 13:50:44 -05:00
fig02
33391c0a5b
Name Remaining Hookshot Actor Flags (#2306)
* name remaining hookshot flags

* tweak comments

* period
2024-11-23 23:19:27 -05:00
Tharo
e10c64a0b4
Add a PARAMS_PACK macro for building actor params setters (#2304) 2024-11-23 22:19:12 -05:00
fig02
6239f8e0b3
Document Hookshot Attachment (#2300)
* document hookshot attachment

* change comment

* swap hookshot function comment

* remove comments
2024-11-21 19:46:49 -05:00
feacur
771570aaa6 give better names to rolling checks 2024-11-20 15:37:25 +01:00
fig02
e0e0e93644
Player: Name all Start Modes (#2302)
* name some start modes

* document blue warp mode

* Revert "document blue warp mode"

This reverts commit d4071a8123.

* name movement modes

* fix door mode comment, it is not broken

* Player_PutSwordInHand

* typo

* how the hell did that happen

* add sword clarification
2024-11-20 03:22:55 -05:00
fig02
ae1a1adcf1
Player Docs: Begin "Start Mode" Documentation (#2301)
* set up start mode

* note unused modes

* fix bss
2024-11-18 18:47:41 -05:00
feacur
5d1bf7727f follow the bugs documentation style guide 2024-11-18 21:09:13 +01:00
feacur
5ba85a3f7e name animation reversing func as such 2024-11-18 13:32:57 +01:00
feacur
fe53732127 give a function a better name 2024-11-18 13:19:39 +01:00
cadmic
5881164453
Fix VROM address handling in sym_info.py (#2292) 2024-11-17 17:34:23 -05:00
fig02
17edb82c0d
Decouple Debug Features From gc-eu-mq-dbg (#2296)
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
2024-11-17 17:02:07 -05:00
cadmic
cf4dc98cc9
Use debug macros even in N64-only code (#2298)
* Use debug macros even in N64-only code

* Use UNK_FILE/UNK_LINE instead
2024-11-15 13:18:05 -05:00
Leonid Kapitonov
e46fcbdbc9
Document enum PauseState game over parts (#2283)
* [document] `enum PauseState`, game over parts

* apply Jenkins fixes (automatic code formatting)

also, as previously, i've rerun the "make" to check integrity

* add `PAUSE_STATE_GAME_OVER_*` comments

in case it helps to rename them later, if the need ever arises

* improve `PAUSE_STATE_GAME_OVER_SAVE_*` comments

also i've noticed, that `z64pause.h` doesn't comply fully with the `.clang-format`

temporary changing a couple of setting to
- ColumnLimit: 0
- AlignTrailingComments: false
fixes the issue. i don't want to push unrelated formatting here

* remove redundant comments

https://github.com/zeldaret/oot/pull/2283#discussion_r1827652667

* apply PR naming suggestions

reverified with
> `check_format.py ...`
> `make ...`
2024-11-15 03:37:10 -05:00
feacur
423748a140 use BINANG macros instead of hex values 2024-11-15 02:18:10 +01:00
feacur
768297f400 clarify "in range" of what it is 2024-11-15 00:43:56 +01:00
cadmic
c55a1dab57
fix_bss.py: Fix infinite loop after linker errors (#2297) 2024-11-14 12:35:35 -05:00
feacur
d8911078a4 yeah, be less judgemental 2024-11-14 10:22:48 +01:00
feacur
406349987f Document actor.params bits allocation
an "ammendment" for 57951edb82

somehow haven't saved the changes that time
2024-11-14 02:23:01 +01:00
feacur
57951edb82 Document actor.params bits allocation 2024-11-14 02:14:03 +01:00
feacur
911550550f link two if parts with and else
https://github.com/zeldaret/oot/pull/2295#discussion_r1841272907
2024-11-14 02:14:03 +01:00
feacur
1fa1922a9b tweak EnGo2_UpdateTalking code and comments
https://github.com/zeldaret/oot/pull/2295#discussion_r1841205108
https://github.com/zeldaret/oot/pull/2295#discussion_r1841210644
https://github.com/zeldaret/oot/pull/2295#discussion_r1841256344
https://github.com/zeldaret/oot/pull/2295#discussion_r1841268480
2024-11-14 02:14:03 +01:00
feacur
e87bc05aff use uniform naming between variables
https://github.com/zeldaret/oot/pull/2295#discussion_r1841202090
2024-11-14 02:14:03 +01:00
feacur
2ab3f6b66e remove unnecessary comment
https://github.com/zeldaret/oot/pull/2295#discussion_r1841170202
2024-11-14 02:14:03 +01:00
feacur
fff6cf4b49 remove a [mis]leading zero 2024-11-14 02:14:03 +01:00
feacur
e2cda143b7 CAGED_FLAG -> CAGED_SWITCH_FLAG
https://github.com/zeldaret/oot/pull/2295#discussion_r1841166305
2024-11-14 02:14:02 +01:00
feacur
a8dff36326 remove unnecessary block braces
https://github.com/zeldaret/oot/pull/2295#discussion_r1841154818
2024-11-14 02:09:19 +01:00
feacur
57c4c7653f document the nature of type values
https://github.com/zeldaret/oot/pull/2295#discussion_r1841150757
2024-11-14 02:09:18 +01:00
feacur
9fae0fa37c make the unused comment a header
https://github.com/zeldaret/oot/pull/2295#discussion_r1841145730
2024-11-14 00:04:54 +01:00
feacur
46648b4ab7 name Hot Rodder consistently
https://github.com/zeldaret/oot/pull/2295#discussion_r1841188972
2024-11-14 00:02:44 +01:00
feacur
011cf6a5d1 fix a misleading comment 2024-11-13 13:51:36 +01:00
feacur
77fde2c89b rematch EnGo2_RollingSlow 2024-11-13 13:28:59 +01:00
feacur
7f3642d522 give better enum names 2024-11-13 13:06:30 +01:00
feacur
17d5b2aaa3 give better names to the attention switching funcs 2024-11-13 12:59:42 +01:00
feacur
7c1d6f54df rename func_80A408D8 -> EnGo_AttentionLost 2024-11-13 12:53:48 +01:00
feacur
35d0d71008 EnGo2_IsCameraModified -> EnGo2_ShouldStay 2024-11-13 12:26:33 +01:00
feacur
1c416becd6 rematch EnGo2_UpdateTalking a bit 2024-11-13 12:25:22 +01:00
feacur
da79fb473f document focusOffset variables 2024-11-13 12:13:56 +01:00
feacur
37569e2518 Document func_80A44790 as EnGo2_UpdateTalking
rename `.isAwake` as `.isTalkative
2024-11-13 12:13:56 +01:00
feacur
dbe0a46137 unify EnGo2 waking up naming 2024-11-13 12:12:52 +01:00
feacur
41b9cd0487 rematch EnGo2_StopRolling 2024-11-13 12:12:52 +01:00
feacur
b908614ceb Document EnGo2 funtions based on the context 2024-11-13 12:12:51 +01:00
feacur
fc1009a0a6 Document EnGo2 known data 2024-11-13 12:12:01 +01:00
feacur
9be708d6b9 Document EnGo2 opening Goron's cage 2024-11-13 12:12:01 +01:00