summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/daycare.h6
-rw-r--r--include/constants/weather.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/include/constants/daycare.h b/include/constants/daycare.h
index adb62fab5..e412d2ab7 100644
--- a/include/constants/daycare.h
+++ b/include/constants/daycare.h
@@ -1,11 +1,11 @@
#ifndef GUARD_DAYCARE_CONSTANTS_H
#define GUARD_DAYCARE_CONSTANTS_H
-// Parent compatability scores
+// Parent compatibility scores
#define PARENTS_INCOMPATIBLE 0
#define PARENTS_LOW_COMPATIBILITY 20
-#define PARENTS_MED_COMPATABILITY 50
-#define PARENTS_MAX_COMPATABILITY 70
+#define PARENTS_MED_COMPATIBILITY 50
+#define PARENTS_MAX_COMPATIBILITY 70
// Daycare state
#define DAYCARE_NO_MONS 0
diff --git a/include/constants/weather.h b/include/constants/weather.h
index aa0309882..becbdda87 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -39,8 +39,6 @@
// These are the "abnormal weather events" that are used
// to find Kyogre and Groudon.
-#define ABNORMAL_WEATHER_LOCATIONS (MARINE_CAVE_LOCATIONS + TERRA_CAVE_LOCATIONS)
-#define ABNORMAL_WEATHER_NONE 0
// Groudon/Terra Cave locations
#define TERRA_CAVE_LOCATIONS_START 1
@@ -66,4 +64,7 @@
#define ABNORMAL_WEATHER_ROUTE_129_EAST (MARINE_CAVE_LOCATIONS_START + 7)
#define MARINE_CAVE_LOCATIONS 8
+#define ABNORMAL_WEATHER_LOCATIONS (MARINE_CAVE_LOCATIONS + TERRA_CAVE_LOCATIONS)
+#define ABNORMAL_WEATHER_NONE 0
+
#endif // GUARD_CONSTANTS_WEATHER_H