From 333d2f37a811c05672f785a13af47708ccc08613 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Fri, 17 May 2019 15:34:34 +0100 Subject: [PATCH] Add weather.h --- data/map_events.s | 2 +- data/maps.s | 3 +-- include/constants/maps.h | 16 ---------------- include/constants/weather.h | 20 ++++++++++++++++++++ 4 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 include/constants/weather.h diff --git a/data/map_events.s b/data/map_events.s index aabafa21f2..d5d0e23291 100644 --- 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 index 9cb61ccb47..a0ff008cd9 100644 --- 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 index bdf68444e0..db8ee451cc 100644 --- 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 new file mode 100644 index 0000000000..a45d2e5233 --- /dev/null +++ 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