Use DIR constants for createvobject

Also uses event object ids in LinkContestRoom1

2 files changed, 10 insertions, 13 deletions

diff --git a/include/constants/global.h b/include/constants/global.h
index 1177f0444..a862ecad2 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -76,4 +76,14 @@
 #define OPTIONS_BATTLE_STYLE_SHIFT 0
 #define OPTIONS_BATTLE_STYLE_SET 1
 
+#define DIR_NONE        0
+#define DIR_SOUTH       1
+#define DIR_NORTH       2
+#define DIR_WEST        3
+#define DIR_EAST        4
+#define DIR_SOUTHWEST   5
+#define DIR_SOUTHEAST   6
+#define DIR_NORTHWEST   7
+#define DIR_NORTHEAST   8
+
 #endif // GUARD_CONSTANTS_GLOBAL_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index b5a86e311..a17180589 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -267,19 +267,6 @@ enum
 
 enum
 {
-    DIR_NONE,
-    DIR_SOUTH,
-    DIR_NORTH,
-    DIR_WEST,
-    DIR_EAST,
-    DIR_SOUTHWEST,
-    DIR_SOUTHEAST,
-    DIR_NORTHWEST,
-    DIR_NORTHEAST,
-};
-
-enum
-{
     COLLISION_LEDGE_JUMP = 6
 };