falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,230 Commits 1 Branch 0 Tags 491 MiB
Commit Graph

977 Commits

Author SHA1 Message Date
feacur 133a74fc78 ugh, use defines instead of an enum 
probably size of enum entries doesn't match well? originally these were
just numbers. besides, not like it's a real enumeration from zero to a
value or some bit flags
 2024-11-19 19:00:29 +01:00
feacur 3530507e46 Merge branch 'main' into doc/cutscene_index 2024-11-19 16:31:38 +01: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 450e24e899 Merge branch 'main' into doc/cutscene_index 2024-11-18 00:49:36 +01: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 bee188dcd8 Merge branch 'main' into doc/cutscene_index 2024-11-13 20:11:01 +01: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
feacur 02a977f27d ok, now the last two `CS_INDEX_*` are less unknown 
the purpose of `CS_INDEX_BARRIER` is not quite clear still
 2024-11-05 18:58:03 +01:00
feacur d9bbd67137 rename the flag for automatic `sceneLayer` calc 
it gets assigned to the `nextCutsceneIndex`,
so `CS_INDEX_NONE` name was misleading
 2024-11-05 17:07:03 +01:00
feacur 6eaaa8706c rename the flag for freeing `nextCutsceneIndex` 2024-11-05 17:00:42 +01:00
feacur 2bd2ca20dd remove redundant comments, fix the header comment 
and add a comment chunk from https://github.com/zeldaret/oot/pull/2286#discussion_r1829108940
 2024-11-05 16:27:43 +01:00
fig02 0d04f51e8e
Document Arrow Related Actor Flags (#2284) 
* name arrow actor flags

* fix flag check
 2024-11-05 07:31:28 -05:00
feacur 32a2dd0ae2 apply a PR suggestion 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829219841
 2024-11-05 13:16:22 +01:00
feacur 2ec57c90a6 improve `CS_INDEX_*` naming, rem `ENTRANCE` suffix 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829165205

reverified with
> `check_format.py ...`
> `make ...`
 2024-11-05 12:34:35 +01:00
feacur 8cbdf80d86 rename `CS_INDEX_*` with PR suggestions 
and some additional observations
reverified with
> `check_format.py ...`
> `make ...`

additionally:
- current clang-format lacks a rule for trailing commas
- compiler says about them `cfe: Warning 624`
 2024-11-05 12:17:39 +01:00
Leonid Kapitonov 2ae3bff3b8
apply a draft PR suggestion 
Co-authored-by: mzxrules <mzxrules@gmail.com>
 2024-11-05 11:26:18 +01:00
feacur 050c736411 crudely rename `enum CutsceneIndex` entries 2024-11-05 03:47:32 +01:00
feacur 53cd39d38f introduce `enum CutsceneIndex` as a first step 2024-11-05 00:43:59 +01: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