1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-05 09:15:58 +00:00
Commit graph

970 commits

Author SHA1 Message Date
engineer124
6199634ffb
Minor Cleanup (#2308)
* cleanup

* more

* fix floats
2024-12-01 07:55:50 -05: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
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
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
cadmic
d886ebe711
[ntsc-1.0/1.1] Match audio and loose ends (#2293)
* Match ntsc-1.0/1.1 loose ends

* Revert audioseq_padding

* Fix spelling
2024-11-11 17:50:56 -05:00
fig02
0d04f51e8e
Document Arrow Related Actor Flags (#2284)
* name arrow actor flags

* fix flag check
2024-11-05 07:31:28 -05:00
fig02
e50581b9fb
ACTOR_FLAG_ENKUSA_CUT -> ACTOR_FLAG_GRASS_DESTROYED (#2285)
* rename enkusa cut to bush destroyed

* bush -> grass

* clump
2024-11-04 18:22:44 -05:00
Pepe20129
2c1d2d74bc
Document PLAYER_STATE1_SHIELDING (#2279)
* Document `PLAYER_STATE1_SHIELDING`

* Fix format
2024-10-24 22:14:34 -04:00
fig02
3677c11140
Document ACTOR_FLAG_CAN_PRESS_SWITCHES (#2275)
* document switch activation

* format

* activate -> press

* fix comment
2024-10-20 23:19:14 -04:00
fig02
f4210323a2
Document ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT (#2276)
* name ACTOR_FLAG_HIT_PLAYER_THUMP_SFX

* ACTOR_FLAG_HIT_PLAYER_THUMP_SFX -> ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT
2024-10-20 22:29:50 -04:00
fig02
e55e909477
Document ACTOR_FLAG_UPDATE_DURING_OCARINA and PLAYER_STATE2_USING_OCARINA (#2277)
* Document ACTOR_FLAG_UPDATE_DURING_OCARINA

* document PLAYER_STATE2_USING_OCARINA

* format

* comment tweak

* treat var as flag
2024-10-17 21:44:35 -04:00
fig02
df1815cf8f
Document ACTOR_FLAG_THROW_ONLY (#2274)
* document ACTOR_FLAG_THROW_ONLY

* flip function name

* add comments
2024-10-15 14:10:21 -04:00
Derek Hensley
a53fb02699
EnHy + objects docs (#1499)
* document object_bba

* Clean up cne

* object bob

* object_aob

* object_cob

* object_bji

* object_ahg

* object_boj

* All functions named plus some cleanup

* enums

* Remove body wiggle comments

* Format

* Remove case comments

* comments with default

* Format

* format
2024-10-15 05:20:46 -04:00
mzxrules
2f54db142e
Rename RoomBehaviorType1 to RoomType (#2271)
* Rename RoomBehaviorType1 to RoomType

* suggestions

* Update include/z64scene.h

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-10-14 15:23:50 -04:00
Pepe20129
d0b4725869
Document Player_Action_8084F390 (#2264)
* Document Player_Action_8084F390

* Rename linkYawToStepTowards into shapeYawTarget

* Fix BSS

* Address reviews

* Fix format

* Address Review
2024-10-13 13:33:16 -04:00
mzxrules
eee7ba9bd5
Rename RoomBehaviorType2 (#2270)
* Rename RoomBehavior2

* fig proposal

* fig comment
2024-10-12 22:28:55 -04:00
Pepe20129
44460eeaec
Document Player_Action_SwingBottle (#2263)
* Document Player_Action_8084ECA4

* Name func_8083721C

* Add note

* Move BottleCatchAnimationData declaration

* Apply format

* Revert "Name func_8083721C"

This reverts commit aeb7ea83ab.

* Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing
changes made to 547280abf2a041a8f6884d43b2eada7802c7feec.

* Reapply "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit e9bf122be5.

* Some more bottle docs (#1)

* more docs

* struct comments

* format.py

* Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"

This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing
changes made to 547280abf2a041a8f6884d43b2eada7802c7feec.

* add clarifying comment

* review, fix bss

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-10-11 16:31:06 -04:00
fig02
f79c9db649
Document Player_Action_TurnInPlace (#2268)
* document turn in place

* format

* modify comments

* sWaterSpeedFactor
2024-10-11 12:22:04 -04:00
fig02
53c57599a4
Name talking action related things (#2260)
* name talking related things

* Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem

* splitting action stuff to new PR

* format
2024-10-10 22:04:30 -04:00
fig02
fdf502dcdd
Document Player_Action_Idle (#2266)
* document Player_Action_Idle

* Player_DecelerateToZero

* cleanup R_RUN_SPEED_LIMIT usages

* format

* typo

* reorder reg

* shake timer is used for fall damage

* comment on shake timer only being processed in one place

* format and edit comment

* shakeTimer -> fallDamageStunTimer
2024-10-10 12:56:39 -04:00
Dragorn421
ba9c60552b
Player doc: some rotation logic/data (#1443)
* Docs: some player rotation logic/data

* Improve misleading comment

* rename temps

* unk_6AE_rotFlags

* format

* disasm metadata
2024-10-09 20:22:52 -04:00
cadmic
621b8f38c5
[ntsc-1.0/1.1] Match audio library (#2243)
* [ntsc-1.0/1.1] Match audio library

* Don't include versions.h in audio table headers

* Include versions.h where audio tables are used
2024-10-09 10:53:16 -04:00
cadmic
60f9607569
[ntsc-1.0/1.1] Match "system" files (#2254) 2024-10-09 09:48:53 -04:00
fig02
7dd8f2b6ad
Document Player_ChooseNextIdleAnim (#2262)
* document most of Player_ChooseNextIdleAnim

* finish documenting Player_ChooseNextIdleAnim

* capital letter

* dummy block numbers for the script

* fix bss

* bug comment

* SpeicalIdle -> Fidget, clean up related things

* fix rng chance comment

* normal -> default

* rework Player_CheckForIdleAnim

* swap idle anim defines

* remove COMMON_FIDGET

* add ARRAY_COUNT_2D

* change macro def
2024-10-08 00:19:10 -04:00
fig02
6b31fdad53
Player: AnimMovement (#2245)
* name top level stuff

* newlines

* Document Player AnimMovement

* tweak comment

* spelling

* review

* rework comment
2024-10-04 13:52:03 -04:00
fig02
49759e42d7
Actor flag: ACTOR_FLAG_CARRY_X_ROT_INFLUENCE (#2237)
* document x rot carry flag

* tweak comment

* typo

* review

* flag tweak
2024-10-01 18:27:29 -04:00
Dragorn421
ed77e143b6
[headers] Create one_point_cutscene.h, z64olib.h and move stuff to z64{object,player,scene}.h (#2250)
* [headers] Create `one_point_cutscene.h`, `z64olib.h` and move stuff to `z64{object,player,scene}.h`

* bss

* sSceneCmdHandlers

* bss

* bss
2024-10-01 13:14:54 -04:00
Dragorn421
47c6c36dc3
[headers] Create zelda_arena.h, move protos to z64effect.h, and misc fixups (#2248)
* [headers] Create z64malloc.h, move protos to z64effect.h, and misc fixups

* zelda_arena.h

* bss

* bss2

* bss3

* bss
2024-10-01 08:46:56 +02:00
fig02
80ed596c56
Name Talking Related Actor Flags (#2230)
* document talking related actor flags

* tweak comment

* review

* tweak

* accept -> accepted

* add more clarification
2024-09-30 06:24:43 -04:00
cadmic
04498f808f
[PAL N64] Match file select language selection (#2240)
* [PAL N64] Match file select language selection

* sInitialLanguageInputTimerY -> sInitialLanguageInputTimerX
2024-09-28 13:12:57 -04:00
cadmic
c6160e1980
[ntsc-1.0/1.1] Match PAL 1.0 viconfig changes (#2231)
* [ntsc-1.0/1.1] Match viconfig changes

* SREG(48) -> R_VI_MODE_EDIT_STATE
2024-09-27 16:44:35 -04:00
Dragorn421
fbf797f1e2
[headers] Create gfxalloc.h, map.h, move protos to gfx.h, z64{player,view}.h (#2233)
* [headers] Create gfxalloc.h, map.h, move protos to z64{actor,player,view}.h

* oops

* bss

* comment on player_lib protos & format

* format map.h

* Move SCREEN_{WIDTH,HEIGHT} and SET_FULLSCREEN_VIEWPORT to z64view.h

* bss

* revert move screen_width/height

* bss
2024-09-27 14:51:00 -04:00
Dragorn421
f70e363392
[headers] z64bgcheck.h functions (#2239)
* [headers] z64bgcheck.h functions

* format

* bss
2024-09-27 11:29:19 +02:00
Dragorn421
bc8945eb3a
[headers] Move libultra protos to ultra64.h (as a temporary measure) (#2234)
* [headers] Move libultra protos to ultra64.h (as a temporary measure)

* format ultra64.h

* bss

* bss

* bss
2024-09-26 23:58:43 -04:00
cadmic
bccb219ea3
Fix typos found by codespell (#2229) 2024-09-26 00:21:00 -04:00
Dragorn421
43c3971aaf
Pause docs: Quest quads (#2224)
* Pause docs: Quest quads

* `QUAD_QUEST_` -> `QUEST_QUAD_`
2024-09-25 22:45:19 -04:00
fig02
9da16a8fd8
Player: Player_ActionHandler_Talk (#2226)
* document Player_ActionHandler_Talk

* format

* comment tweak

* review

* capitalization
2024-09-25 22:11:11 -04:00
cadmic
0acaed6d17
[PAL N64] Match z_message.c (#2202) 2024-09-25 17:41:08 -04:00
fig02
8ff4faa084
Player Docs: Player_ActionChange_6, Rolling and Put Away (#1949)
* progress

* changing branches

* start comments

* last few changes

* name the handler after rolling only

* comment tweak

* format
2024-09-25 15:46:15 -04:00
Dragorn421
7ccb0a641e
[headers] Create letterbox.h, move more protos from functions.h (#2225)
* [headers] Create z64shrink_window.h, move more protos from functions.h

* format

* include

* bss

* letterbox.h
2024-09-25 13:45:06 -04:00
Dragorn421
5ed5f196d9
[headers] audio functions to z64audio.h and z64ocarina.h (#2223)
* [headers] audio functions to z64audio.h and z64ocarina.h

* bss
2024-09-25 10:25:49 +02:00
Dragorn421
e331805c0a
Pause docs: Songs playback (#2220)
* Pause docs: Songs playback

* `VREG(21-25)` -> `VREG(21) to VREG(25)`

* comments on quest-song related main states

* make `sPlayedSongBtns` `+1`-sized to account for trailing INVALID button note in a 8-btn-notes song
2024-09-25 00:27:31 -04:00
Dragorn421
a09ea76025
[headers] gfx_setupdl.h and z64skin_matrix.h (#2221)
* [headers] gfx_setupdl.h and z64skin_matrix.h

* include z64skin_matrix.h

* bss

* bss
2024-09-24 18:18:01 -04:00