diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-12-18 08:18:56 +1100 |
|---|---|---|
| committer | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-09-16 14:37:07 -0400 |
| commit | 56e0cde29f2bfe87d164022ed9997ba10fabaf01 (patch) | |
| tree | d849dbdbff4d25e77f2e9a7ff7ac5a900f662dfd /mm/include | |
| parent | 391f6d1f58d6ece21e5e6b82e64932ed5df3ceca (diff) | |
Document Update Actor Flags (#1762)
* name flags, TODO: comments
* comments
* improve comments
* small cleanup
* cleanup comment
Diffstat (limited to 'mm/include')
| -rw-r--r-- | mm/include/z64actor.h | 13 | ||||
| -rw-r--r-- | mm/include/z64play.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mm/include/z64actor.h b/mm/include/z64actor.h index dc4748ef9..a7ac50797 100644 --- a/mm/include/z64actor.h +++ b/mm/include/z64actor.h @@ -600,10 +600,15 @@ typedef enum DoorLockType { // When chosen as the next lock-on actor, this flag is unset. #define ACTOR_FLAG_FOCUS_ACTOR_REFINDABLE (1 << 19) -// -#define ACTOR_FLAG_100000 (1 << 20) -// -#define ACTOR_FLAG_200000 (1 << 21) +// Actor can update even if Player is currently in one of the `sCategoryFreezeMasks` states. +// Typically an actor will halt while the player is in one of the `sCategoryFreezeMasks` states (depending on category). +// This flag allows a given actor to be an exception. +#define ACTOR_FLAG_FREEZE_EXCEPTION (1 << 20) + +// Actor can update even if the Song of Soaring Cutscene or the Song of Time Cutscene is playing. +// Typically an actor will halt while the Song of Soaring Cutscene or the Song of Time Cutscene is playing. +// This flag allows a given actor to be an exception. +#define ACTOR_FLAG_UPDATE_DURING_SOARING_AND_SOT_CS (1 << 21) // Specifies whether the actor can (not) use fake point lights, in the event that ucode point lights are not compatible with its display lists. // In F3DZEX2 versions that predate MM, microcode point lights didn't exist so `PointLight_t` could not be used. diff --git a/mm/include/z64play.h b/mm/include/z64play.h index 65d3cd44c..d1e2e2ee4 100644 --- a/mm/include/z64play.h +++ b/mm/include/z64play.h @@ -85,7 +85,7 @@ typedef struct PlayState { /* 0x187FC */ MtxF billboardMtxF; /* 0x1883C */ Mtx* billboardMtx; /* 0x18840 */ u32 gameplayFrames; - /* 0x18844 */ u8 unk_18844; // bool + /* 0x18844 */ u8 soaringCsOrSoTCsPlaying; // Either the Song of Soaring Cutscene or the Song of Time Cutscene is playing. /* 0x18845 */ u8 haltAllActors; /* 0x18846 */ s16 numSetupActors; /* 0x18848 */ RoomList roomList; |