Add DialogType and DialogFlagType enums

2 files changed, 32 insertions, 14 deletions

diff --git a/include/npc.h b/include/npc.h
index 20e66117..2be97262 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -19,6 +19,38 @@
 
 #include "structures.h"
 
+typedef enum {
+    DIALOG_ROOM_FLAG,
+    DIALOG_LOCAL_FLAG,
+    DIALOG_GLOBAL_FLAG,
+    DIALOG_KINSTONE,
+    DIALOG_INVENTORY,
+} DialogFlagType;
+
+typedef enum {
+    DIALOG_NONE,
+    DIALOG_NORMAL,
+    DIALOG_SET_FLAG,
+    DIALOG_TOGGLE_FLAG,
+    DIALOG_CHECK_FLAG,
+    DIALOG_CALL_FUNC,
+    DIALOG_MINISH,
+} DialogType;
+
+typedef struct {
+    u32 flag : 12;
+    DialogFlagType flagType : 4;
+    DialogType type : 4;
+    u32 fromSelf : 1;
+    union {
+        struct {
+            u16 a;
+            u16 b;
+        } indices;
+        void (*func)(Entity* e);
+    } data;
+} Dialog;
+
 void sub_0806EC20(Entity* ent);
 void sub_0806EC38(void);
 u32 sub_0806ED78(Entity* ent);
diff --git a/include/structures.h b/include/structures.h
index 0f77cac0..88798071 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -175,20 +175,6 @@ typedef struct {
 } struct_02034480;
 extern struct_02034480 gUnk_02034480;
 
-typedef struct {
-    u32 flag : 12;
-    u32 flagType : 4;
-    u32 type : 4;
-    u32 unk : 1;
-    union {
-        struct {
-            u16 a;
-            u16 b;
-        } indices;
-        void (*func)(Entity* e);
-    } data;
-} Dialog;
-
 extern u16 gBG0Buffer[0x400];
 extern u16 gBG1Buffer[0x400];
 extern u16 gBG2Buffer[0x400];