diff --git a/src/engine/graph_node.c b/src/engine/graph_node.c
index 95a9a06ae..7143d9dd9 100644
--- a/src/engine/graph_node.c
+++ b/src/engine/graph_node.c
@@ -430,11 +430,15 @@ struct GraphNodeShadow *init_graph_node_shadow(struct AllocOnlyPool *pool,
 
     if (graphNode != NULL) {
 #ifdef LEGACY_SHADOW_IDS
-        if (shadowType == 1 || shadowType == 2 || shadowType == 99) {
+        if (shadowType == LEGACY_SHADOW_CIRCLE_9_VERTS
+         || shadowType == LEGACY_SHADOW_CIRCLE_4_VERTS
+         || shadowType == LEGACY_SHADOW_CIRCLE_4_VERTS_FLAT_UNUSED
+         || shadowType == LEGACY_SHADOW_CIRCLE_PLAYER) {
             shadowType = SHADOW_CIRCLE;
-        } else if (shadowType == 11 || shadowType == 12) {
+        } else if (shadowType == LEGACY_SHADOW_SQUARE_SCALABLE
+                || shadowType == LEGACY_SHADOW_SQUARE_TOGGLABLE) {
             shadowType = SHADOW_SQUARE;
-        } else if (shadowType == 10) {
+        } else if (shadowType == LEGACY_SHADOW_SQUARE_PERMANENT) {
             shadowType = SHADOW_SQUARE_PERMANENT;
         }
 #endif
diff --git a/src/game/shadow.h b/src/game/shadow.h
index dd4049cb6..f76702934 100644
--- a/src/game/shadow.h
+++ b/src/game/shadow.h
@@ -12,6 +12,14 @@
  */
 enum ShadowType {
 #ifdef LEGACY_SHADOW_IDS
+    LEGACY_SHADOW_CIRCLE_9_VERTS             =  0,
+    LEGACY_SHADOW_CIRCLE_4_VERTS             =  1,
+    LEGACY_SHADOW_CIRCLE_4_VERTS_FLAT_UNUSED =  2,
+    LEGACY_SHADOW_SQUARE_PERMANENT           = 10,
+    LEGACY_SHADOW_SQUARE_SCALABLE            = 11,
+    LEGACY_SHADOW_SQUARE_TOGGLABLE           = 12,
+    LEGACY_SHADOW_CIRCLE_PLAYER              = 99,
+
     SHADOW_CIRCLE           = 5,
     SHADOW_CIRCLE_PLAYER    = SHADOW_CIRCLE,
     SHADOW_CIRCLE_4_VERTS   = SHADOW_CIRCLE,