diff options
| -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 | ||||
| -rw-r--r-- | include/constants/region_map_sections.h (renamed from include/constants/region_map.h) | 6 | ||||
| -rw-r--r-- | src/daycare.c | 2 | ||||
| -rw-r--r-- | src/field_specials.c | 2 | ||||
| -rw-r--r-- | src/map_preview_screen.c | 2 | ||||
| -rw-r--r-- | src/region_map.c | 2 | ||||
| -rw-r--r-- | src/roamer.c | 2 | ||||
| -rw-r--r-- | src/trade_scene.c | 2 | ||||
| -rw-r--r-- | src/wild_pokemon_area.c | 2 |
12 files changed, 14 insertions, 14 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" diff --git a/include/constants/region_map.h b/include/constants/region_map_sections.h index 78dab242c..4f60212db 100644 --- a/include/constants/region_map.h +++ b/include/constants/region_map_sections.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_REGION_MAP_H -#define GUARD_CONSTANTS_REGION_MAP_H +#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H +#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H #define MAPSEC_LITTLEROOT_TOWN 0x00 #define MAPSEC_OLDALE_TOWN 0x01 @@ -210,4 +210,4 @@ #define METLOC_IN_GAME_TRADE 0xFE #define METLOC_FATEFUL_ENCOUNTER 0xFF -#endif //GUARD_CONSTANTS_REGION_MAP_H +#endif //GUARD_CONSTANTS_REGION_MAP_SECTIONS_H diff --git a/src/daycare.c b/src/daycare.c index 4d1b5aa7b..0a19c6c9b 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -28,7 +28,7 @@ #include "field_fadetransition.h" #include "trade.h" #include "constants/daycare.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" // Combination of RSE's Day-Care (re-used on Four Island), FRLG's Day-Care, and egg_hatch.c diff --git a/src/field_specials.c b/src/field_specials.c index 25d2eceb7..5be7a4d1c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -42,7 +42,7 @@ #include "constants/species.h" #include "constants/items.h" #include "constants/maps.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/moves.h" #include "constants/menu.h" #include "constants/event_objects.h" diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index cae25b986..1788b17cc 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -14,7 +14,7 @@ #include "overworld.h" #include "event_data.h" #include "map_preview_screen.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" static EWRAM_DATA bool8 sHasVisitedMapBefore = FALSE; static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE; diff --git a/src/region_map.c b/src/region_map.c index 0c2d511bf..731abc59f 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -19,7 +19,7 @@ #include "map_preview_screen.h" #include "constants/flags.h" #include "constants/songs.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/spawn_points.h" #include "constants/maps.h" diff --git a/src/roamer.c b/src/roamer.c index 25b5109b0..f3e8bbccd 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -4,7 +4,7 @@ #include "field_specials.h" #include "constants/species.h" #include "constants/maps.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" EWRAM_DATA u8 sLocationHistory[3][2] = {}; EWRAM_DATA u8 sRoamerLocation[2] = {}; diff --git a/src/trade_scene.c b/src/trade_scene.c index 9f0b83ec9..d609a9b53 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -39,7 +39,7 @@ #include "constants/items.h" #include "constants/easy_chat.h" #include "constants/songs.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/moves.h" #define TAG_GLOW1_TILES 5550 diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c index 28c07abc7..ccdd27b40 100644 --- a/src/wild_pokemon_area.c +++ b/src/wild_pokemon_area.c @@ -6,7 +6,7 @@ #include "overworld.h" #include "pokedex_area_markers.h" #include "constants/vars.h" -#include "constants/region_map.h" +#include "constants/region_map_sections.h" #include "constants/species.h" struct SeviiDexArea |