diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2024-10-11 22:31:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-11 16:31:06 -0400 |
| commit | 44460eeaec1824f4e361e1e243c06862cbf4f8c8 (patch) | |
| tree | 02db55f3dfbadbf846ff511515668fedc73cee4d /include | |
| parent | f79c9db649cb1a78f8fa8c1e0e06b77c2e0f747c (diff) | |
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 aeb7ea83abf470e81f88056e577bd1fb796ad7ec.
* 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 e9bf122be5a5641d31238d53c7ba788e560d8dd1.
* 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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64player.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/z64player.h b/include/z64player.h index bc4fe7209..4447ab81e 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -877,12 +877,15 @@ typedef struct Player { /* 0x084F */ union { s8 actionVar1; + s8 bottleCatchType; // Player_Action_SwingBottle: entry type for `sBottleCatchInfo`, corresponds to actor caught in a bottle } av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running /* 0x0850 */ union { s16 actionVar2; s16 fallDamageStunTimer; // Player_Action_Idle: Prevents any movement and shakes model up and down quickly to indicate fall damage stun s16 bonked; // Player_Action_Roll: set to true after bonking into a wall or an actor + s16 startedTextbox; // Player_Action_SwingBottle: set to true when the textbox is started + s16 inWater; // Player_Action_SwingBottle: true if a bottle is swung in water. Used to determine which bottle swing animation to use. } av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running /* 0x0854 */ f32 unk_854; |