summaryrefslogtreecommitdiff
path: root/include/constants/weather.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants/weather.h')
-rw-r--r--include/constants/weather.h47
1 files changed, 25 insertions, 22 deletions
diff --git a/include/constants/weather.h b/include/constants/weather.h
index 98a0a2e1e..aa0309882 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -39,28 +39,31 @@
// These are the "abnormal weather events" that are used
// to find Kyogre and Groudon.
-#define ABNORMAL_WEATHER_COUNT_PER_LEGENDARY 8
-#define ABNORMAL_WEATHER_GROUDON_LOCATIONS_START 1
-#define ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START 1 + ABNORMAL_WEATHER_COUNT_PER_LEGENDARY
+#define ABNORMAL_WEATHER_LOCATIONS (MARINE_CAVE_LOCATIONS + TERRA_CAVE_LOCATIONS)
+#define ABNORMAL_WEATHER_NONE 0
-#define ABNORMAL_WEATHER_NONE 0
-// Groudon locations
-#define ABNORMAL_WEATHER_ROUTE_114_NORTH 1
-#define ABNORMAL_WEATHER_ROUTE_114_SOUTH 2
-#define ABNORMAL_WEATHER_ROUTE_115_WEST 3
-#define ABNORMAL_WEATHER_ROUTE_115_EAST 4
-#define ABNORMAL_WEATHER_ROUTE_116_NORTH 5
-#define ABNORMAL_WEATHER_ROUTE_116_SOUTH 6
-#define ABNORMAL_WEATHER_ROUTE_118_EAST 7
-#define ABNORMAL_WEATHER_ROUTE_118_WEST 8
-// Kyogre locations
-#define ABNORMAL_WEATHER_ROUTE_105_NORTH 9
-#define ABNORMAL_WEATHER_ROUTE_105_SOUTH 10
-#define ABNORMAL_WEATHER_ROUTE_125_WEST 11
-#define ABNORMAL_WEATHER_ROUTE_125_EAST 12
-#define ABNORMAL_WEATHER_ROUTE_127_NORTH 13
-#define ABNORMAL_WEATHER_ROUTE_127_SOUTH 14
-#define ABNORMAL_WEATHER_ROUTE_129_WEST 15
-#define ABNORMAL_WEATHER_ROUTE_129_EAST 16
+// Groudon/Terra Cave locations
+#define TERRA_CAVE_LOCATIONS_START 1
+#define ABNORMAL_WEATHER_ROUTE_114_NORTH (TERRA_CAVE_LOCATIONS_START + 0)
+#define ABNORMAL_WEATHER_ROUTE_114_SOUTH (TERRA_CAVE_LOCATIONS_START + 1)
+#define ABNORMAL_WEATHER_ROUTE_115_WEST (TERRA_CAVE_LOCATIONS_START + 2)
+#define ABNORMAL_WEATHER_ROUTE_115_EAST (TERRA_CAVE_LOCATIONS_START + 3)
+#define ABNORMAL_WEATHER_ROUTE_116_NORTH (TERRA_CAVE_LOCATIONS_START + 4)
+#define ABNORMAL_WEATHER_ROUTE_116_SOUTH (TERRA_CAVE_LOCATIONS_START + 5)
+#define ABNORMAL_WEATHER_ROUTE_118_EAST (TERRA_CAVE_LOCATIONS_START + 6)
+#define ABNORMAL_WEATHER_ROUTE_118_WEST (TERRA_CAVE_LOCATIONS_START + 7)
+#define TERRA_CAVE_LOCATIONS 8
+
+// Kyogre/Marina Cave locations
+#define MARINE_CAVE_LOCATIONS_START (TERRA_CAVE_LOCATIONS_START + TERRA_CAVE_LOCATIONS)
+#define ABNORMAL_WEATHER_ROUTE_105_NORTH (MARINE_CAVE_LOCATIONS_START + 0)
+#define ABNORMAL_WEATHER_ROUTE_105_SOUTH (MARINE_CAVE_LOCATIONS_START + 1)
+#define ABNORMAL_WEATHER_ROUTE_125_WEST (MARINE_CAVE_LOCATIONS_START + 2)
+#define ABNORMAL_WEATHER_ROUTE_125_EAST (MARINE_CAVE_LOCATIONS_START + 3)
+#define ABNORMAL_WEATHER_ROUTE_127_NORTH (MARINE_CAVE_LOCATIONS_START + 4)
+#define ABNORMAL_WEATHER_ROUTE_127_SOUTH (MARINE_CAVE_LOCATIONS_START + 5)
+#define ABNORMAL_WEATHER_ROUTE_129_WEST (MARINE_CAVE_LOCATIONS_START + 6)
+#define ABNORMAL_WEATHER_ROUTE_129_EAST (MARINE_CAVE_LOCATIONS_START + 7)
+#define MARINE_CAVE_LOCATIONS 8
#endif // GUARD_CONSTANTS_WEATHER_H