Add weather.h

Missingmew · May 17, 2019 · 333d2f3 · 333d2f3
1 parent cfc43d1
commit 333d2f3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/data/map_events.s b/data/map_events.s
@@ -8,7 +8,7 @@
 #include "constants/maps.h"
 @#include "constants/secret_bases.h"
 #include "constants/vars.h"
-@#include "constants/weather.h"
+#include "constants/weather.h"
 @#include "constants/trainer_hill.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"

diff --git a/data/maps.s b/data/maps.s
@@ -1,11 +1,10 @@
 #include "constants/layouts.h"
 @#include "constants/map_types.h"
 #include "constants/maps.h"
-@#include "constants/weather.h"
 #include "constants/region_map.h"
 #include "constants/songs.h"
 #include "constants/items.h"
-@#include "constants/weather.h"
+#include "constants/weather.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 

diff --git a/include/constants/maps.h b/include/constants/maps.h
@@ -40,20 +40,4 @@
 #define MAP_TYPE_8 8
 #define MAP_TYPE_9 9
 
-#define WEATHER_NONE               0
-#define WEATHER_SUNNY_CLOUDS       1   // unused
-#define WEATHER_SUNNY              2
-#define WEATHER_RAIN               3   // unused
-#define WEATHER_SNOW               4   // unused
-#define WEATHER_RAIN_THUNDERSTORM  5   // unused
-#define WEATHER_FOG_HORIZONTAL     6
-#define WEATHER_VOLCANIC_ASH       7   // unused
-#define WEATHER_SANDSTORM          8   // unused
-#define WEATHER_FOG_DIAGONAL       9   // unused
-#define WEATHER_UNDERWATER         10  // unused
-#define WEATHER_CLOUDY             11
-#define WEATHER_DROUGHT            12  // unused and broken in overworld
-#define WEATHER_DOWNPOUR           13  // unused
-#define WEATHER_UNDERWATER_BUBBLES 14  // unused
-
 #endif  // GUARD_CONSTANTS_MAPS_H
diff --git a/include/constants/weather.h b/include/constants/weather.h
@@ -0,0 +1,20 @@
+#ifndef GUARD_CONSTANTS_WEATHER_H
+#define GUARD_CONSTANTS_WEATHER_H
+
+#define WEATHER_NONE               0
+#define WEATHER_SUNNY_CLOUDS       1   // unused
+#define WEATHER_SUNNY              2
+#define WEATHER_RAIN               3   // unused
+#define WEATHER_SNOW               4   // unused
+#define WEATHER_RAIN_THUNDERSTORM  5   // unused
+#define WEATHER_FOG_HORIZONTAL     6
+#define WEATHER_VOLCANIC_ASH       7   // unused
+#define WEATHER_SANDSTORM          8   // unused
+#define WEATHER_FOG_DIAGONAL       9   // unused
+#define WEATHER_UNDERWATER         10  // unused
+#define WEATHER_CLOUDY             11
+#define WEATHER_DROUGHT            12  // unused and broken in overworld
+#define WEATHER_DOWNPOUR           13  // unused
+#define WEATHER_UNDERWATER_BUBBLES 14  // unused
+
+#endif  // GUARD_CONSTANTS_WEATHER_H