message definitions

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);
 

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?

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);

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;