From cbe6e27f3760d6e95d9f2af301c8320aa0a809e2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Mar 2020 01:04:27 -0400 Subject: region_map.h to region_map_sections.h --- data/field_weather.s | 2 +- data/maps.s | 2 +- data/pokedex_screen.s | 2 +- data/pokemon_special_anim.s | 2 +- include/constants/region_map.h | 213 -------------------------------- include/constants/region_map_sections.h | 213 ++++++++++++++++++++++++++++++++ src/daycare.c | 2 +- src/field_specials.c | 2 +- src/map_preview_screen.c | 2 +- src/region_map.c | 2 +- src/roamer.c | 2 +- src/trade_scene.c | 2 +- src/wild_pokemon_area.c | 2 +- 13 files changed, 224 insertions(+), 224 deletions(-) delete mode 100644 include/constants/region_map.h create mode 100644 include/constants/region_map_sections.h 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.h deleted file mode 100644 index 78dab242c..000000000 --- a/include/constants/region_map.h +++ /dev/null @@ -1,213 +0,0 @@ -#ifndef GUARD_CONSTANTS_REGION_MAP_H -#define GUARD_CONSTANTS_REGION_MAP_H - -#define MAPSEC_LITTLEROOT_TOWN 0x00 -#define MAPSEC_OLDALE_TOWN 0x01 -#define MAPSEC_DEWFORD_TOWN 0x02 -#define MAPSEC_LAVARIDGE_TOWN 0x03 -#define MAPSEC_FALLARBOR_TOWN 0x04 -#define MAPSEC_VERDANTURF_TOWN 0x05 -#define MAPSEC_PACIFIDLOG_TOWN 0x06 -#define MAPSEC_PETALBURG_CITY 0x07 -#define MAPSEC_SLATEPORT_CITY 0x08 -#define MAPSEC_MAUVILLE_CITY 0x09 -#define MAPSEC_RUSTBORO_CITY 0x0A -#define MAPSEC_FORTREE_CITY 0x0B -#define MAPSEC_LILYCOVE_CITY 0x0C -#define MAPSEC_MOSSDEEP_CITY 0x0D -#define MAPSEC_SOOTOPOLIS_CITY 0x0E -#define MAPSEC_EVER_GRANDE_CITY 0x0F -#define MAPSEC_ROUTE_101 0x10 -#define MAPSEC_ROUTE_102 0x11 -#define MAPSEC_ROUTE_103 0x12 -#define MAPSEC_ROUTE_104 0x13 -#define MAPSEC_ROUTE_105 0x14 -#define MAPSEC_ROUTE_106 0x15 -#define MAPSEC_ROUTE_107 0x16 -#define MAPSEC_ROUTE_108 0x17 -#define MAPSEC_ROUTE_109 0x18 -#define MAPSEC_ROUTE_110 0x19 -#define MAPSEC_ROUTE_111 0x1A -#define MAPSEC_ROUTE_112 0x1B -#define MAPSEC_ROUTE_113 0x1C -#define MAPSEC_ROUTE_114 0x1D -#define MAPSEC_ROUTE_115 0x1E -#define MAPSEC_ROUTE_116 0x1F -#define MAPSEC_ROUTE_117 0x20 -#define MAPSEC_ROUTE_118 0x21 -#define MAPSEC_ROUTE_119 0x22 -#define MAPSEC_ROUTE_120 0x23 -#define MAPSEC_ROUTE_121 0x24 -#define MAPSEC_ROUTE_122 0x25 -#define MAPSEC_ROUTE_123 0x26 -#define MAPSEC_ROUTE_124 0x27 -#define MAPSEC_ROUTE_125 0x28 -#define MAPSEC_ROUTE_126 0x29 -#define MAPSEC_ROUTE_127 0x2A -#define MAPSEC_ROUTE_128 0x2B -#define MAPSEC_ROUTE_129 0x2C -#define MAPSEC_ROUTE_130 0x2D -#define MAPSEC_ROUTE_131 0x2E -#define MAPSEC_ROUTE_132 0x2F -#define MAPSEC_ROUTE_133 0x30 -#define MAPSEC_ROUTE_134 0x31 -#define MAPSEC_UNDERWATER_124 0x32 -#define MAPSEC_UNDERWATER_125 0x33 -#define MAPSEC_UNDERWATER_126 0x34 -#define MAPSEC_UNDERWATER_127 0x35 -#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 -#define MAPSEC_GRANITE_CAVE 0x37 -#define MAPSEC_MT_CHIMNEY 0x38 -#define MAPSEC_SAFARI_ZONE 0x39 -#define MAPSEC_BATTLE_FRONTIER 0x3A -#define MAPSEC_PETALBURG_WOODS 0x3B -#define MAPSEC_RUSTURF_TUNNEL 0x3C -#define MAPSEC_ABANDONED_SHIP 0x3D -#define MAPSEC_NEW_MAUVILLE 0x3E -#define MAPSEC_METEOR_FALLS 0x3F -#define MAPSEC_METEOR_FALLS2 0x40 -#define MAPSEC_MT_PYRE 0x41 -#define MAPSEC_AQUA_HIDEOUT_OLD 0x42 -#define MAPSEC_SHOAL_CAVE 0x43 -#define MAPSEC_SEAFLOOR_CAVERN 0x44 -#define MAPSEC_UNDERWATER_128 0x45 -#define MAPSEC_VICTORY_ROAD 0x46 -#define MAPSEC_MIRAGE_ISLAND 0x47 -#define MAPSEC_CAVE_OF_ORIGIN 0x48 -#define MAPSEC_SOUTHERN_ISLAND 0x49 -#define MAPSEC_FIERY_PATH 0x4A -#define MAPSEC_FIERY_PATH2 0x4B -#define MAPSEC_JAGGED_PASS 0x4C -#define MAPSEC_JAGGED_PASS2 0x4D -#define MAPSEC_SEALED_CHAMBER 0x4E -#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F -#define MAPSEC_SCORCHED_SLAB 0x50 -#define MAPSEC_ISLAND_CAVE 0x51 -#define MAPSEC_DESERT_RUINS 0x52 -#define MAPSEC_ANCIENT_TOMB 0x53 -#define MAPSEC_INSIDE_OF_TRUCK 0x54 -#define MAPSEC_SKY_PILLAR 0x55 -#define MAPSEC_SECRET_BASE 0x56 -#define MAPSEC_DYNAMIC 0x57 - -#define MAPSECS_KANTO 0x58 - -#define MAPSEC_PALLET_TOWN 0x58 -#define MAPSEC_VIRIDIAN_CITY 0x59 -#define MAPSEC_PEWTER_CITY 0x5A -#define MAPSEC_CERULEAN_CITY 0x5B -#define MAPSEC_LAVENDER_TOWN 0x5C -#define MAPSEC_VERMILION_CITY 0x5D -#define MAPSEC_CELADON_CITY 0x5E -#define MAPSEC_FUCHSIA_CITY 0x5F -#define MAPSEC_CINNABAR_ISLAND 0x60 -#define MAPSEC_INDIGO_PLATEAU 0x61 -#define MAPSEC_SAFFRON_CITY 0x62 -#define MAPSEC_ROUTE_4_FLYDUP 0x63 -#define MAPSEC_ROUTE_10_FLYDUP 0x64 -#define MAPSEC_ROUTE_1 0x65 -#define MAPSEC_ROUTE_2 0x66 -#define MAPSEC_ROUTE_3 0x67 -#define MAPSEC_ROUTE_4 0x68 -#define MAPSEC_ROUTE_5 0x69 -#define MAPSEC_ROUTE_6 0x6A -#define MAPSEC_ROUTE_7 0x6B -#define MAPSEC_ROUTE_8 0x6C -#define MAPSEC_ROUTE_9 0x6D -#define MAPSEC_ROUTE_10 0x6E -#define MAPSEC_ROUTE_11 0x6F -#define MAPSEC_ROUTE_12 0x70 -#define MAPSEC_ROUTE_13 0x71 -#define MAPSEC_ROUTE_14 0x72 -#define MAPSEC_ROUTE_15 0x73 -#define MAPSEC_ROUTE_16 0x74 -#define MAPSEC_ROUTE_17 0x75 -#define MAPSEC_ROUTE_18 0x76 -#define MAPSEC_ROUTE_19 0x77 -#define MAPSEC_ROUTE_20 0x78 -#define MAPSEC_ROUTE_21 0x79 -#define MAPSEC_ROUTE_22 0x7A -#define MAPSEC_ROUTE_23 0x7B -#define MAPSEC_ROUTE_24 0x7C -#define MAPSEC_ROUTE_25 0x7D -#define MAPSEC_VIRIDIAN_FOREST 0x7E -#define MAPSEC_MT_MOON 0x7F -#define MAPSEC_S_S_ANNE 0x80 -#define MAPSEC_UNDERGROUND_PATH 0x81 -#define MAPSEC_UNDERGROUND_PATH_2 0x82 -#define MAPSEC_DIGLETTS_CAVE 0x83 -#define MAPSEC_KANTO_VICTORY_ROAD 0x84 -#define MAPSEC_ROCKET_HIDEOUT 0x85 -#define MAPSEC_SILPH_CO 0x86 -#define MAPSEC_POKEMON_MANSION 0x87 -#define MAPSEC_KANTO_SAFARI_ZONE 0x88 -#define MAPSEC_POKEMON_LEAGUE 0x89 -#define MAPSEC_ROCK_TUNNEL 0x8A -#define MAPSEC_SEAFOAM_ISLANDS 0x8B -#define MAPSEC_POKEMON_TOWER 0x8C -#define MAPSEC_CERULEAN_CAVE 0x8D -#define MAPSEC_POWER_PLANT 0x8E - -#define MAPSECS_SEVII_123 0x8F - -#define MAPSEC_ONE_ISLAND 0x8F -#define MAPSEC_TWO_ISLAND 0x90 -#define MAPSEC_THREE_ISLAND 0x91 -#define MAPSEC_FOUR_ISLAND 0x92 -#define MAPSEC_FIVE_ISLAND 0x93 -#define MAPSEC_SEVEN_ISLAND 0x94 -#define MAPSEC_SIX_ISLAND 0x95 -#define MAPSEC_KINDLE_ROAD 0x96 -#define MAPSEC_TREASURE_BEACH 0x97 -#define MAPSEC_CAPE_BRINK 0x98 -#define MAPSEC_BOND_BRIDGE 0x99 -#define MAPSEC_THREE_ISLE_PORT 0x9A -#define MAPSEC_SEVII_ISLE_6 0x9B -#define MAPSEC_SEVII_ISLE_7 0x9C -#define MAPSEC_SEVII_ISLE_8 0x9D -#define MAPSEC_SEVII_ISLE_9 0x9E -#define MAPSEC_RESORT_GORGEOUS 0x9F -#define MAPSEC_WATER_LABYRINTH 0xA0 -#define MAPSEC_FIVE_ISLE_MEADOW 0xA1 -#define MAPSEC_MEMORIAL_PILLAR 0xA2 -#define MAPSEC_OUTCAST_ISLAND 0xA3 -#define MAPSEC_GREEN_PATH 0xA4 -#define MAPSEC_WATER_PATH 0xA5 -#define MAPSEC_RUIN_VALLEY 0xA6 -#define MAPSEC_TRAINER_TOWER 0xA7 -#define MAPSEC_CANYON_ENTRANCE 0xA8 -#define MAPSEC_SEVAULT_CANYON 0xA9 -#define MAPSEC_TANOBY_RUINS 0xAA -#define MAPSEC_SEVII_ISLE_22 0xAB -#define MAPSEC_SEVII_ISLE_23 0xAC -#define MAPSEC_SEVII_ISLE_24 0xAD -#define MAPSEC_NAVEL_ROCK 0xAE -#define MAPSEC_MT_EMBER 0xAF -#define MAPSEC_BERRY_FOREST 0xB0 -#define MAPSEC_ICEFALL_CAVE 0xB1 -#define MAPSEC_ROCKET_WAREHOUSE 0xB2 -#define MAPSEC_TRAINER_TOWER_2 0xB3 -#define MAPSEC_DOTTED_HOLE 0xB4 -#define MAPSEC_LOST_CAVE 0xB5 -#define MAPSEC_PATTERN_BUSH 0xB6 -#define MAPSEC_ALTERING_CAVE 0xB7 -#define MAPSEC_TANOBY_CHAMBERS 0xB8 -#define MAPSEC_THREE_ISLE_PATH 0xB9 -#define MAPSEC_TANOBY_KEY 0xBA -#define MAPSEC_BIRTH_ISLAND 0xBB -#define MAPSEC_MONEAN_CHAMBER 0xBC -#define MAPSEC_LIPTOO_CHAMBER 0xBD -#define MAPSEC_WEEPTH_CHAMBER 0xBE -#define MAPSEC_DILFORD_CHAMBER 0xBF -#define MAPSEC_SCUFIB_CHAMBER 0xC0 -#define MAPSEC_RIXY_CHAMBER 0xC1 -#define MAPSEC_VIAPOIS_CHAMBER 0xC2 -#define MAPSEC_EMBER_SPA 0xC3 -#define MAPSEC_SPECIAL_AREA 0xC4 -#define MAPSEC_NONE 0xC5 - -#define METLOC_SPECIAL_EGG 0xFD -#define METLOC_IN_GAME_TRADE 0xFE -#define METLOC_FATEFUL_ENCOUNTER 0xFF - -#endif //GUARD_CONSTANTS_REGION_MAP_H diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h new file mode 100644 index 000000000..4f60212db --- /dev/null +++ b/include/constants/region_map_sections.h @@ -0,0 +1,213 @@ +#ifndef GUARD_CONSTANTS_REGION_MAP_SECTIONS_H +#define GUARD_CONSTANTS_REGION_MAP_SECTIONS_H + +#define MAPSEC_LITTLEROOT_TOWN 0x00 +#define MAPSEC_OLDALE_TOWN 0x01 +#define MAPSEC_DEWFORD_TOWN 0x02 +#define MAPSEC_LAVARIDGE_TOWN 0x03 +#define MAPSEC_FALLARBOR_TOWN 0x04 +#define MAPSEC_VERDANTURF_TOWN 0x05 +#define MAPSEC_PACIFIDLOG_TOWN 0x06 +#define MAPSEC_PETALBURG_CITY 0x07 +#define MAPSEC_SLATEPORT_CITY 0x08 +#define MAPSEC_MAUVILLE_CITY 0x09 +#define MAPSEC_RUSTBORO_CITY 0x0A +#define MAPSEC_FORTREE_CITY 0x0B +#define MAPSEC_LILYCOVE_CITY 0x0C +#define MAPSEC_MOSSDEEP_CITY 0x0D +#define MAPSEC_SOOTOPOLIS_CITY 0x0E +#define MAPSEC_EVER_GRANDE_CITY 0x0F +#define MAPSEC_ROUTE_101 0x10 +#define MAPSEC_ROUTE_102 0x11 +#define MAPSEC_ROUTE_103 0x12 +#define MAPSEC_ROUTE_104 0x13 +#define MAPSEC_ROUTE_105 0x14 +#define MAPSEC_ROUTE_106 0x15 +#define MAPSEC_ROUTE_107 0x16 +#define MAPSEC_ROUTE_108 0x17 +#define MAPSEC_ROUTE_109 0x18 +#define MAPSEC_ROUTE_110 0x19 +#define MAPSEC_ROUTE_111 0x1A +#define MAPSEC_ROUTE_112 0x1B +#define MAPSEC_ROUTE_113 0x1C +#define MAPSEC_ROUTE_114 0x1D +#define MAPSEC_ROUTE_115 0x1E +#define MAPSEC_ROUTE_116 0x1F +#define MAPSEC_ROUTE_117 0x20 +#define MAPSEC_ROUTE_118 0x21 +#define MAPSEC_ROUTE_119 0x22 +#define MAPSEC_ROUTE_120 0x23 +#define MAPSEC_ROUTE_121 0x24 +#define MAPSEC_ROUTE_122 0x25 +#define MAPSEC_ROUTE_123 0x26 +#define MAPSEC_ROUTE_124 0x27 +#define MAPSEC_ROUTE_125 0x28 +#define MAPSEC_ROUTE_126 0x29 +#define MAPSEC_ROUTE_127 0x2A +#define MAPSEC_ROUTE_128 0x2B +#define MAPSEC_ROUTE_129 0x2C +#define MAPSEC_ROUTE_130 0x2D +#define MAPSEC_ROUTE_131 0x2E +#define MAPSEC_ROUTE_132 0x2F +#define MAPSEC_ROUTE_133 0x30 +#define MAPSEC_ROUTE_134 0x31 +#define MAPSEC_UNDERWATER_124 0x32 +#define MAPSEC_UNDERWATER_125 0x33 +#define MAPSEC_UNDERWATER_126 0x34 +#define MAPSEC_UNDERWATER_127 0x35 +#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36 +#define MAPSEC_GRANITE_CAVE 0x37 +#define MAPSEC_MT_CHIMNEY 0x38 +#define MAPSEC_SAFARI_ZONE 0x39 +#define MAPSEC_BATTLE_FRONTIER 0x3A +#define MAPSEC_PETALBURG_WOODS 0x3B +#define MAPSEC_RUSTURF_TUNNEL 0x3C +#define MAPSEC_ABANDONED_SHIP 0x3D +#define MAPSEC_NEW_MAUVILLE 0x3E +#define MAPSEC_METEOR_FALLS 0x3F +#define MAPSEC_METEOR_FALLS2 0x40 +#define MAPSEC_MT_PYRE 0x41 +#define MAPSEC_AQUA_HIDEOUT_OLD 0x42 +#define MAPSEC_SHOAL_CAVE 0x43 +#define MAPSEC_SEAFLOOR_CAVERN 0x44 +#define MAPSEC_UNDERWATER_128 0x45 +#define MAPSEC_VICTORY_ROAD 0x46 +#define MAPSEC_MIRAGE_ISLAND 0x47 +#define MAPSEC_CAVE_OF_ORIGIN 0x48 +#define MAPSEC_SOUTHERN_ISLAND 0x49 +#define MAPSEC_FIERY_PATH 0x4A +#define MAPSEC_FIERY_PATH2 0x4B +#define MAPSEC_JAGGED_PASS 0x4C +#define MAPSEC_JAGGED_PASS2 0x4D +#define MAPSEC_SEALED_CHAMBER 0x4E +#define MAPSEC_UNDERWATER_SEALED_CHAMBER 0x4F +#define MAPSEC_SCORCHED_SLAB 0x50 +#define MAPSEC_ISLAND_CAVE 0x51 +#define MAPSEC_DESERT_RUINS 0x52 +#define MAPSEC_ANCIENT_TOMB 0x53 +#define MAPSEC_INSIDE_OF_TRUCK 0x54 +#define MAPSEC_SKY_PILLAR 0x55 +#define MAPSEC_SECRET_BASE 0x56 +#define MAPSEC_DYNAMIC 0x57 + +#define MAPSECS_KANTO 0x58 + +#define MAPSEC_PALLET_TOWN 0x58 +#define MAPSEC_VIRIDIAN_CITY 0x59 +#define MAPSEC_PEWTER_CITY 0x5A +#define MAPSEC_CERULEAN_CITY 0x5B +#define MAPSEC_LAVENDER_TOWN 0x5C +#define MAPSEC_VERMILION_CITY 0x5D +#define MAPSEC_CELADON_CITY 0x5E +#define MAPSEC_FUCHSIA_CITY 0x5F +#define MAPSEC_CINNABAR_ISLAND 0x60 +#define MAPSEC_INDIGO_PLATEAU 0x61 +#define MAPSEC_SAFFRON_CITY 0x62 +#define MAPSEC_ROUTE_4_FLYDUP 0x63 +#define MAPSEC_ROUTE_10_FLYDUP 0x64 +#define MAPSEC_ROUTE_1 0x65 +#define MAPSEC_ROUTE_2 0x66 +#define MAPSEC_ROUTE_3 0x67 +#define MAPSEC_ROUTE_4 0x68 +#define MAPSEC_ROUTE_5 0x69 +#define MAPSEC_ROUTE_6 0x6A +#define MAPSEC_ROUTE_7 0x6B +#define MAPSEC_ROUTE_8 0x6C +#define MAPSEC_ROUTE_9 0x6D +#define MAPSEC_ROUTE_10 0x6E +#define MAPSEC_ROUTE_11 0x6F +#define MAPSEC_ROUTE_12 0x70 +#define MAPSEC_ROUTE_13 0x71 +#define MAPSEC_ROUTE_14 0x72 +#define MAPSEC_ROUTE_15 0x73 +#define MAPSEC_ROUTE_16 0x74 +#define MAPSEC_ROUTE_17 0x75 +#define MAPSEC_ROUTE_18 0x76 +#define MAPSEC_ROUTE_19 0x77 +#define MAPSEC_ROUTE_20 0x78 +#define MAPSEC_ROUTE_21 0x79 +#define MAPSEC_ROUTE_22 0x7A +#define MAPSEC_ROUTE_23 0x7B +#define MAPSEC_ROUTE_24 0x7C +#define MAPSEC_ROUTE_25 0x7D +#define MAPSEC_VIRIDIAN_FOREST 0x7E +#define MAPSEC_MT_MOON 0x7F +#define MAPSEC_S_S_ANNE 0x80 +#define MAPSEC_UNDERGROUND_PATH 0x81 +#define MAPSEC_UNDERGROUND_PATH_2 0x82 +#define MAPSEC_DIGLETTS_CAVE 0x83 +#define MAPSEC_KANTO_VICTORY_ROAD 0x84 +#define MAPSEC_ROCKET_HIDEOUT 0x85 +#define MAPSEC_SILPH_CO 0x86 +#define MAPSEC_POKEMON_MANSION 0x87 +#define MAPSEC_KANTO_SAFARI_ZONE 0x88 +#define MAPSEC_POKEMON_LEAGUE 0x89 +#define MAPSEC_ROCK_TUNNEL 0x8A +#define MAPSEC_SEAFOAM_ISLANDS 0x8B +#define MAPSEC_POKEMON_TOWER 0x8C +#define MAPSEC_CERULEAN_CAVE 0x8D +#define MAPSEC_POWER_PLANT 0x8E + +#define MAPSECS_SEVII_123 0x8F + +#define MAPSEC_ONE_ISLAND 0x8F +#define MAPSEC_TWO_ISLAND 0x90 +#define MAPSEC_THREE_ISLAND 0x91 +#define MAPSEC_FOUR_ISLAND 0x92 +#define MAPSEC_FIVE_ISLAND 0x93 +#define MAPSEC_SEVEN_ISLAND 0x94 +#define MAPSEC_SIX_ISLAND 0x95 +#define MAPSEC_KINDLE_ROAD 0x96 +#define MAPSEC_TREASURE_BEACH 0x97 +#define MAPSEC_CAPE_BRINK 0x98 +#define MAPSEC_BOND_BRIDGE 0x99 +#define MAPSEC_THREE_ISLE_PORT 0x9A +#define MAPSEC_SEVII_ISLE_6 0x9B +#define MAPSEC_SEVII_ISLE_7 0x9C +#define MAPSEC_SEVII_ISLE_8 0x9D +#define MAPSEC_SEVII_ISLE_9 0x9E +#define MAPSEC_RESORT_GORGEOUS 0x9F +#define MAPSEC_WATER_LABYRINTH 0xA0 +#define MAPSEC_FIVE_ISLE_MEADOW 0xA1 +#define MAPSEC_MEMORIAL_PILLAR 0xA2 +#define MAPSEC_OUTCAST_ISLAND 0xA3 +#define MAPSEC_GREEN_PATH 0xA4 +#define MAPSEC_WATER_PATH 0xA5 +#define MAPSEC_RUIN_VALLEY 0xA6 +#define MAPSEC_TRAINER_TOWER 0xA7 +#define MAPSEC_CANYON_ENTRANCE 0xA8 +#define MAPSEC_SEVAULT_CANYON 0xA9 +#define MAPSEC_TANOBY_RUINS 0xAA +#define MAPSEC_SEVII_ISLE_22 0xAB +#define MAPSEC_SEVII_ISLE_23 0xAC +#define MAPSEC_SEVII_ISLE_24 0xAD +#define MAPSEC_NAVEL_ROCK 0xAE +#define MAPSEC_MT_EMBER 0xAF +#define MAPSEC_BERRY_FOREST 0xB0 +#define MAPSEC_ICEFALL_CAVE 0xB1 +#define MAPSEC_ROCKET_WAREHOUSE 0xB2 +#define MAPSEC_TRAINER_TOWER_2 0xB3 +#define MAPSEC_DOTTED_HOLE 0xB4 +#define MAPSEC_LOST_CAVE 0xB5 +#define MAPSEC_PATTERN_BUSH 0xB6 +#define MAPSEC_ALTERING_CAVE 0xB7 +#define MAPSEC_TANOBY_CHAMBERS 0xB8 +#define MAPSEC_THREE_ISLE_PATH 0xB9 +#define MAPSEC_TANOBY_KEY 0xBA +#define MAPSEC_BIRTH_ISLAND 0xBB +#define MAPSEC_MONEAN_CHAMBER 0xBC +#define MAPSEC_LIPTOO_CHAMBER 0xBD +#define MAPSEC_WEEPTH_CHAMBER 0xBE +#define MAPSEC_DILFORD_CHAMBER 0xBF +#define MAPSEC_SCUFIB_CHAMBER 0xC0 +#define MAPSEC_RIXY_CHAMBER 0xC1 +#define MAPSEC_VIAPOIS_CHAMBER 0xC2 +#define MAPSEC_EMBER_SPA 0xC3 +#define MAPSEC_SPECIAL_AREA 0xC4 +#define MAPSEC_NONE 0xC5 + +#define METLOC_SPECIAL_EGG 0xFD +#define METLOC_IN_GAME_TRADE 0xFE +#define METLOC_FATEFUL_ENCOUNTER 0xFF + +#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 -- cgit v1.2.3