diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-05-17 15:34:34 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-05-17 15:34:34 +0100 |
| commit | 333d2f37a811c05672f785a13af47708ccc08613 (patch) | |
| tree | 0da99820f8f40f2e726a4aca46cd4eb5a47123d6 | |
| parent | cfc43d11115ab3258592801665caef9cfe859589 (diff) | |
Add weather.h
| -rw-r--r-- | data/map_events.s | 2 | ||||
| -rw-r--r-- | data/maps.s | 3 | ||||
| -rw-r--r-- | include/constants/maps.h | 16 | ||||
| -rw-r--r-- | include/constants/weather.h | 20 |
4 files changed, 22 insertions, 19 deletions
diff --git a/data/map_events.s b/data/map_events.s index aabafa21f..d5d0e2329 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 9cb61ccb4..a0ff008cd 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 bdf68444e..db8ee451c 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 000000000..a45d2e523 --- /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 |