Use map type constants in map headers

2 files changed, 25 insertions, 29 deletions

diff --git a/include/constants/map_types.h b/include/constants/map_types.h
new file mode 100755
index 000000000..cc9ecf8a3
--- /dev/null
+++ b/include/constants/map_types.h
@@ -0,0 +1,25 @@
+#ifndef GUARD_CONSTANTS_MAP_TYPES_H
+#define GUARD_CONSTANTS_MAP_TYPES_H
+
+#define MAP_TYPE_0           0
+#define MAP_TYPE_TOWN        1
+#define MAP_TYPE_CITY        2
+#define MAP_TYPE_ROUTE       3
+#define MAP_TYPE_UNDERGROUND 4
+#define MAP_TYPE_UNDERWATER  5
+#define MAP_TYPE_6           6
+#define MAP_TYPE_7           7
+#define MAP_TYPE_INDOOR      8
+#define MAP_TYPE_SECRET_BASE 9
+
+#define MAP_BATTLE_SCENE_NORMAL       0
+#define MAP_BATTLE_SCENE_GYM          1
+#define MAP_BATTLE_SCENE_MAGMA        2
+#define MAP_BATTLE_SCENE_AQUA         3
+#define MAP_BATTLE_SCENE_SIDNEY       4
+#define MAP_BATTLE_SCENE_PHOEBE       5
+#define MAP_BATTLE_SCENE_GLACIA       6
+#define MAP_BATTLE_SCENE_DRAKE        7
+#define MAP_BATTLE_SCENE_BATTLE_TOWER 8
+
+#endif  // GUARD_CONSTANTS_MAP_TYPES_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 15766a350..aa13a9ac0 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -11,35 +11,6 @@ enum
     CONNECTION_EMERGE
 };
 
-// map types
-enum
-{
-    MAP_TYPE_0,             // 0
-    MAP_TYPE_TOWN,          // 1
-    MAP_TYPE_CITY,          // 2
-    MAP_TYPE_ROUTE,         // 3
-    MAP_TYPE_UNDERGROUND,   // 4
-    MAP_TYPE_UNDERWATER,    // 5
-    MAP_TYPE_6,             // 6
-    MAP_TYPE_7,             // 7
-    MAP_TYPE_INDOOR,        // 8
-    MAP_TYPE_SECRET_BASE    // 9
-};
-
-// map battle scenes
-enum
-{
-    MAP_BATTLE_SCENE_NORMAL,       // 0
-    MAP_BATTLE_SCENE_GYM,          // 1
-    MAP_BATTLE_SCENE_MAGMA,        // 2
-    MAP_BATTLE_SCENE_AQUA,         // 3
-    MAP_BATTLE_SCENE_SIDNEY,       // 4
-    MAP_BATTLE_SCENE_PHOEBE,       // 5
-    MAP_BATTLE_SCENE_GLACIA,       // 6
-    MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
-};
-
 typedef void (*TilesetCB)(void);
 
 struct Tileset