diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-28 21:58:54 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-28 21:58:54 -0800 |
| commit | d07c41664190a12c4f56d2e71eae8aa41f40ce21 (patch) | |
| tree | 5b5fcbabc56e46060cd64bb3db9e3f07a119c998 /include | |
| parent | 56688ac226db420c7b8ee7080f7185da58437fbc (diff) | |
message definitions
Diffstat (limited to 'include')
| -rw-r--r-- | include/entity.h | 9 | ||||
| -rw-r--r-- | include/message.h | 4 | ||||
| -rw-r--r-- | include/player.h | 2 | ||||
| -rw-r--r-- | include/structures.h | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/include/entity.h b/include/entity.h index cbb54201..5b5c328d 100644 --- a/include/entity.h +++ b/include/entity.h @@ -389,9 +389,12 @@ Entity* FindEntity(u32 kind, u32 id, u32 listIndex, u32 type, u32 type2); void SetEntityPriority(Entity* entity, u32 prio); /** - * Check if entity will be deleted next frame. + * Check if entity is disabled. Entities are disabled if: + * - They are deleted. + * - There is an event and the entity doesn't have priority + * (n/a if entity is in action 0). */ -bool32 EntityIsDeleted(Entity* entity); +bool32 EntityDisabled(Entity* entity); /** * Check if system or entity is blocking updates. @@ -477,7 +480,7 @@ void SetInitializationPriority(void); /** * Reset the system update priority. */ -void ResetSystemPriority(void); +void ClearEventPriority(void); void sub_0805E958(void); diff --git a/include/message.h b/include/message.h index 344bf4ed..32f9f582 100644 --- a/include/message.h +++ b/include/message.h @@ -5,8 +5,10 @@ #include "entity.h" #include "structures.h" +#define MESSAGE_ACTIVE 0x7f + typedef struct { - u8 doTextBox; + u8 state; u8 unk; u8 textSpeed; u8 unk3; // HI? diff --git a/include/player.h b/include/player.h index db8c1f08..38e186e5 100644 --- a/include/player.h +++ b/include/player.h @@ -720,7 +720,7 @@ s32 AddInteractableObject(Entity*, u32, u32); void RemoveInteractableObject(Entity*); s32 GetInteractableObjectIndex(); void sub_08078AC0(u32, u32, u32); -void sub_08078B48(void); +void PausePlayer(void); void sub_08078E84(Entity*, Entity*); void sub_08078FB0(Entity*); void sub_080792BC(s32, u32, u32); diff --git a/include/structures.h b/include/structures.h index 0cbe9c71..6125cba9 100644 --- a/include/structures.h +++ b/include/structures.h @@ -191,7 +191,7 @@ extern ItemBehavior gActiveItems[MAX_ACTIVE_ITEMS]; static_assert(sizeof(gActiveItems) == 0x70); typedef struct { - u8 sys_priority; // system requested priority + u8 event_priority; // system requested priority u8 ent_priority; // entity requested priority u8 queued_priority; u8 queued_priority_reset; |