2 files changed, 39 insertions, 12 deletions
diff --git a/include/constants/weather.h b/include/constants/weather.h
new file mode 100644
index 000000000..946316984
--- /dev/null
+++ b/include/constants/weather.h
@@ -0,0 +1,39 @@
+#ifndef GUARD_CONSTANTS_WEATHER_H
+#define GUARD_CONSTANTS_WEATHER_H
+
+#define WEATHER_NONE           0
+#define WEATHER_CLOUDS         1
+#define WEATHER_SUNNY          2
+#define WEATHER_RAIN_LIGHT     3
+#define WEATHER_SNOW           4
+#define WEATHER_RAIN_MED       5
+#define WEATHER_FOG_1          6
+#define WEATHER_ASH            7
+#define WEATHER_SANDSTORM      8
+#define WEATHER_FOG_2          9
+#define WEATHER_FOG_3          10
+#define WEATHER_DARK           11
+#define WEATHER_DROUGHT        12
+#define WEATHER_RAIN_HEAVY     13
+#define WEATHER_BUBBLES        14
+#define WEATHER_ROUTE119_CYCLE 20
+#define WEATHER_ROUTE123_CYCLE 21
+
+// These are used in maps' coord_weather_event entries.
+// They are not a one-to-one mapping with the engine's
+// internal weather constants above.
+#define COORD_EVENT_WEATHER_CLOUDS         1
+#define COORD_EVENT_WEATHER_SUNNY          2
+#define COORD_EVENT_WEATHER_RAIN_LIGHT     3
+#define COORD_EVENT_WEATHER_SNOW           4
+#define COORD_EVENT_WEATHER_RAIN_MED       5
+#define COORD_EVENT_WEATHER_FOG_1          6
+#define COORD_EVENT_WEATHER_FOG_2          7
+#define COORD_EVENT_WEATHER_ASH            8
+#define COORD_EVENT_WEATHER_SANDSTORM      9
+#define COORD_EVENT_WEATHER_DARK           10
+#define COORD_EVENT_WEATHER_DROUGHT        11
+#define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20
+#define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21
+
+#endif  // GUARD_CONSTANTS_WEATHER_H
diff --git a/include/field_weather.h b/include/field_weather.h
index ed16b2bf6..c96d4055e 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -1,18 +1,6 @@
 #ifndef GUARD_WEATHER_H
 #define GUARD_WEATHER_H
 
-#define WEATHER_NONE 0
-#define WEATHER_CLOUDS 1
-#define WEATHER_RAIN_LIGHT 3
-#define WEATHER_SNOW 4
-#define WEATHER_RAIN_MED 5
-#define WEATHER_FOG_1 6
-#define WEATHER_ASH 7
-#define WEATHER_FOG_2 9
-#define WEATHER_DROUGHT 12
-#define WEATHER_RAIN_HEAVY 13
-#define WEATHER_BUBBLES 14
-
 struct Sprite;
 
 struct Weather