diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-11 09:05:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 09:05:36 -0400 |
| commit | dbe688f9528eb94bdd1dd9c3fa4621b660ba97d1 (patch) | |
| tree | 91bcda1848a71f021478cdadcfc1a80114a68775 /data | |
| parent | bbd5b2dfed5fd22607d52e605f416ff77d3b3681 (diff) | |
| parent | cbe6e27f3760d6e95d9f2af301c8320aa0a809e2 (diff) | |
Merge pull request #297 from GriffinRichards/fix-mapsec
Sync region_map_sections.h name
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_weather.s | 2 | ||||
| -rw-r--r-- | data/maps.s | 2 | ||||
| -rw-r--r-- | data/pokedex_screen.s | 2 | ||||
| -rw-r--r-- | data/pokemon_special_anim.s | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/field_weather.s b/data/field_weather.s index c8acca001..d872998bf 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) diff --git a/data/maps.s b/data/maps.s index 1bf2350bb..ad3f9c993 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,6 @@ #include "constants/layouts.h" #include "constants/maps.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/items.h" #include "constants/weather.h" diff --git a/data/pokedex_screen.s b/data/pokedex_screen.s index 64d1fba0c..ebbb3da72 100644 --- a/data/pokedex_screen.s +++ b/data/pokedex_screen.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" #include "constants/species.h" diff --git a/data/pokemon_special_anim.s b/data/pokemon_special_anim.s index 16593e4d8..1c479d0c0 100644 --- a/data/pokemon_special_anim.s +++ b/data/pokemon_special_anim.s @@ -1,4 +1,4 @@ -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/flags.h" #include "constants/moves.h" .include "asm/macros.inc" |