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

81 commits

Author SHA1 Message Date
Pepe20129
2c1d2d74bc
Document PLAYER_STATE1_SHIELDING (#2279)
* Document `PLAYER_STATE1_SHIELDING`

* Fix format
2024-10-24 22:14:34 -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
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
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
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
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
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
cadmic
bccb219ea3
Fix typos found by codespell (#2229) 2024-09-26 00:21:00 -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
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
mzxrules
56981d5297
Document Player Knockback related functions (#1601)
* document knockback related functions

* rotation -> yRot

* implement some changes

* Renames and comments

* mq bss

* format

* Intangibility and Invulnerability

* bss

* .bss

* add #pragma increment_block_number to z_en_item00.c

* .bss
2024-09-23 18:31:00 -04:00
fig02
fcd5745d40
PLAYER_STATE1_ACTOR_CARRY -> PLAYER_STATE1_CARRYING_ACTOR (#2213) 2024-09-21 18:25:19 -04:00
fig02
05b908d0eb
Document autoLockOnActor (#2212)
* document autoLockOnActor

* format.py

* backtick

* grammar

* comment adjustments

* word

* letter
2024-09-21 14:49:45 -04:00
fig02
cc0b1bb127
PLAYER_STATE1_DEAD (#2204)
* PLAYER_STATE1_DEAD

* change comment

* format
2024-09-17 08:21:47 -04:00
fig02
8f0e2fc29c
Name PLAYER_STATE1_CHARGING_SPIN_ATTACK (#2203)
* name charge state flag

* format
2024-09-16 17:14:29 -04:00
fig02
c91e62f000
Document zTargetActiveTimer (#2200)
* document zTargetActiveTimer

* edit comments

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

Co-authored-by: cadmic <cadmic24@gmail.com>

* capitalization

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
2024-09-16 12:34:23 -04:00
fig02
03a1502706
More Player Z Target documentation (#2196)
* document flag

* Player_FriendlyLockOnOrParallel

* quirk

* z target functions

* more comments

* more comment changes

* format

* comment change
2024-09-14 16:42:28 -04:00
fig02
e658bed27e
Hostile Lock-On (#2193)
* document flag and functions

* format

* adjust comment

* make the comment more public-facing-friendly
2024-09-13 14:49:55 -04:00
fig02
2e79b83bb8
More target related state flags (#2184)
* name some more flags

* format

* cdi suggestion
2024-09-10 22:00:41 -04:00
fig02
6e0288d155
Boomerang related state flags (#2180)
* boomerang state flags

* finish comment
2024-09-09 21:58:22 -04:00
fig02
900c2f0f68
Name PLAYER_STATE1_ACTOR_CARRY (#2173)
* actor carry flag

* format and add comments

* comment changes
2024-09-08 17:43:27 -04:00
fig02
0168b09628
Player Docs - Parallel (#2167)
* name func and flag

* rest of the docs

* format and comment change

* comment
2024-09-08 08:57:28 -04:00
fig02
907e440f3a
unk_664 -> focusActor [Target Docs 5/?] (#2126)
* unk_664 -> focusActor

* capitalization

* missed a temp
2024-09-05 03:33:30 +09:00
cadmic
e6bc4bd8cb
Add names to all typedef'd structs, unions, and enums (#2028)
* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex
2024-08-12 03:07:48 -04:00
Dragorn421
2ce4742bf6
Fix misc 22 (#1971)
* remove trailing whitespace

* fix/docbug about dright for next page of fault menu

* // size = ...; -> // size = ...

* access `ColliderJntSph.elements` as an array

* fixup doc in PreRender.c

* empty line after decl

* gdSPDefLights1 xyz arguments for direction are signed 8bit values

* doc bug of bad use of free in EffDust actor

* decimal for Actor.colorFilterTimer

* shopItemEntries -> sShopItemEntries

* HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE

* format
2024-06-24 18:39:08 -04:00
fig02
7e8b9144c2
Player Docs: Control stick buffers (#1945)
* name vars and add enum

* name some spin attack stuff

* fix right and left

* forward/backward

* format

* fix retail bss

* sControlStickWorldYaw
2024-04-22 17:35:22 -04:00
fig02
30eb05321d
Player Docs: "sUpperBodyIsBusy" (#1944)
* document upperbodybusy

* change wording for comment and rename upperanimblendweight

* format

* review
2024-04-17 16:24:52 -04:00
fig02
295a8669b8
Player: Document "WaitForPutAway" (#1936)
* document put away delay

* functions.txt

* add a note on delaying indefinitely

* format

* typo

* delay -> wait for put away

* revert unintended formatting change

* add comment to struct member

* format

* fix functions.txt
2024-04-15 13:02:43 -04:00
fig02
7445169e42
targetActor -> talkActor (#1933) 2024-03-24 12:27:45 -04:00
fig02
bd0941405d
Document Player's Face and z_actor FaceChange functions (#1928)
* create some enums

* gonna try struct instead of array

* struct works. add docs too

* inline function comments

* fix function comment

* name faces, move enums

* rename textures

* outnames

* remove comments

* change comment slightly

* fixup face comments

* review

* offset comments

* add and use PLAYER_FACE_MAX

* typo

* more comment on blinkDuration

* another change to the comment
2024-03-23 12:21:45 -04:00
fig02
2b5b0fac06
name shock and burn functions (#1594) 2023-12-15 08:53:51 -05: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
fig02
042a5c5530
rename to upper action (#1570) 2023-11-04 02:59:12 -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
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
engineer124
c39578f971
Introduce Player CueIds (#1559)
* cueId

* cleanup
2023-10-05 10:04:41 -04:00
fig02
2cb4ff4fd3
Player Docs: csMode -> csAction (#1547)
* csmode -> cs action

* format
2023-09-26 12:48:41 -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
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
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
fig02
bedf07d541
Document Player's bgcheck routine (func_80847BA0) (#1503)
* progress

* progress

* progress

* done for now

* floor pitch comments

* sYDistToFloor

* add function comment

* sFloorShapePitch

* typo in header
2023-09-06 13:15:07 -04:00
Dragorn421
542012efa6
Fix misc 19 (#1488)
* "bgs sword" -> "biggoron sword"

* Animation_ChangeImpl: last arg is `ANIMTAPER_` enum

* TransitionTileStatus -> state

* Tiny gbi.h formatting fixups

* some cleanup on floormaster

* misc float ops cleanup

* sunsSongState = SUNSSONG_INACTIVE

* continueFlag == CS_CMD_STOP

* fix few camera names inconsistency

* textual 0 padding? not on my lawn

* libultra: construct address from end of dmem rather than oob from imem

* more free1 -> 2 fixup
2023-01-10 13:03:31 -05:00
fig02
b4c97ce17e
Cleanup player speed and yaw variable names (#1480)
* initial changes

* add comments
2023-01-02 06:15:48 -05:00
fig02
7927e7b330
z_demo documentation (#1327)
* commit old stuff

* progress

* progress

* progress

* progress

* more progress, renaming cues next

* small changes

* enum values added for all actions

* hardcoded values removed when possible

* commands renamed

* first pass of action -> cue

* fix some matches

* some more cleanup

* scriptPtr

* forgot one

* remove cue rot union

* more changes

* some more stuff

* more stuff

* fix matching issues

* some more things

* progress, starting to rename destinations

* small changes

* name some destinations

* more names

* need to switch branch

* progress

* first pass of destination names

* usages fixed

* use destination enum

* fix csdis

* format

* command descriptions

* revert accidental zap changes

* forgot some things

* use a single macro for CutsceneCameraPoint (idk why i didnt think of this sooner)

* typo

* review1

* clarify ruby/sapphire comment

* remove endframe for commands that dont use it

* some more review

* most review, but not all

* scriptPtr -> script, and another small change

* ocarina action

* remove +1 from light settings command, change comment

* actionIndex -> cueIdTemp (i guess)

* _SetCueX -> _SetXFromCue

* format

* tweak fade out seq arg names

* use spline terminology

* more dragorn and engineer review

* misc start/end frame note

* cleanup StartPosRotFromCue vs PosRotFromCue

* cleanup spline terminology

* sPrevCamId -> sReturnToCamId

* comment on debug cs data address

* Cutscene_Init -> Cutscene_InitContext

* single point types are not a list

* remove todo comment

* some more review

* rumble struct names

* some review

* more review

* missed one

* reword pointer comment

* even more review

* match transition terminology with z_play

* change condition and format

* frame count

* command specific structs with alignment

* anon review

* remove unneeded arg from time macro

* yeet `CsCmdGeneric`

* remove unused from single point types

* typo

* compromise attempt -- name endFrame everywhere

* fixes

* fix again

* copied the wrong note

* cutscene data note

* review, format

* compat defines

* idk whats going on man

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-12-24 13:55:17 -05:00