Enum consistency cleanup

include/structs/dungeon_entity.h

@@ -312,20 +312,22 @@ enum ShopkeeperMode
 
 enum AIObjective
 {
+    // 0
     AI_CHASE_TARGET = 1,
-    AI_CHASE_REMEMBERED_TARGET = 2,
-    AI_ROAM = 3,
-    AI_LEAVE_ROOM = 4,
-    AI_RUN_AWAY = 5,
-    AI_STAND_STILL = 6,
-    AI_TAKE_ITEM = 7
+    AI_CHASE_REMEMBERED_TARGET,
+    AI_ROAM,
+    AI_LEAVE_ROOM,
+    AI_RUN_AWAY,
+    AI_STAND_STILL,
+    AI_TAKE_ITEM
 };
 
 enum ClientType
 {
-    CLIENT_TYPE_NONE = 0,
-    CLIENT_TYPE_CLIENT = 1, // Used for mission clients that need rescuing.
+    CLIENT_TYPE_NONE,
+    CLIENT_TYPE_CLIENT, // Used for mission clients that need rescuing.
     CLIENT_TYPE_PARTNER,
+    // 3
     CLIENT_TYPE_DONT_MOVE = 4 // Used for Diglett in the Skarmory boss fight.
 };
 
@@ -336,4 +338,4 @@ enum VisualFlag
     VISUAL_FLAG_RUN_AWAY = 2
 };
 
-#endif
+#endif

include/structs/map.h

@@ -22,10 +22,10 @@ enum TerrainType
 
 enum CrossableTerrain
 {
-    CROSSABLE_TERRAIN_REGULAR = 0,
-    CROSSABLE_TERRAIN_LIQUID = 1,
-    CROSSABLE_TERRAIN_CREVICE = 2,
-    CROSSABLE_TERRAIN_WALL = 3,
+    CROSSABLE_TERRAIN_REGULAR,
+    CROSSABLE_TERRAIN_LIQUID,
+    CROSSABLE_TERRAIN_CREVICE,
+    CROSSABLE_TERRAIN_WALL,
     NUM_CROSSABLE_TERRAIN
 };
 

include/structs/str_items.h

@@ -68,6 +68,7 @@ typedef struct TeamInventory
 } TeamInventory;
 
 // TODO: These should be in constants/
+// Not doing it now since we cannot include enums in the constants file due to being used by the data_item and data_monster assemblers
 
 enum ItemFlag
 {