summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGarak <garakmon@gmail.com>2018-08-10 17:52:52 -0400
committerGitHub <noreply@github.com>2018-08-10 17:52:52 -0400
commitac4a3357755d79505c6ef2daafe7f0d8535a7279 (patch)
tree90e1939426ea365f98f76a1c20b15a47b920488b /src
parent4b58ba2445dd3d4ba5c5ae1035431bcee54bcdce (diff)
Update region_map.c
Diffstat (limited to 'src')
-rw-r--r--src/region_map.c100
1 files changed, 50 insertions, 50 deletions
diff --git a/src/region_map.c b/src/region_map.c
index 4bd89dd18..e9ae4599a 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1264,56 +1264,56 @@ static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_targ
static const u8 sMapHealLocations[][3] =
{
-/* MAPSEC_LITTLEROOT_TOWN */ {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
-/* MAPSEC_OLDALE_TOWN */ {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
-/* MAPSEC_DEWFORD_TOWN */ {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
-/* MAPSEC_LAVARIDGE_TOWN */ {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN},
-/* MAPSEC_FALLARBOR_TOWN */ {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN},
-/* MAPSEC_VERDANTURF_TOWN */ {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN},
-/* MAPSEC_PACIFIDLOG_TOWN */ {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN},
-/* MAPSEC_PETALBURG_CITY */ {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY},
-/* MAPSEC_SLATEPORT_CITY */ {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY},
-/* MAPSEC_MAUVILLE_CITY */ {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY},
-/* MAPSEC_RUSTBORO_CITY */ {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY},
-/* MAPSEC_FORTREE_CITY */ {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY},
-/* MAPSEC_LILYCOVE_CITY */ {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY},
-/* MAPSEC_MOSSDEEP_CITY */ {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY},
-/* MAPSEC_SOOTOPOLIS_CITY */ {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY},
-/* MAPSEC_EVER_GRANDE_CITY */ {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1},
-/* MAPSEC_ROUTE_101 */ {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0},
-/* MAPSEC_ROUTE_102 */ {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0},
-/* MAPSEC_ROUTE_103 */ {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0},
-/* MAPSEC_ROUTE_104 */ {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0},
-/* MAPSEC_ROUTE_105 */ {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0},
-/* MAPSEC_ROUTE_106 */ {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0},
-/* MAPSEC_ROUTE_107 */ {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0},
-/* MAPSEC_ROUTE_108 */ {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0},
-/* MAPSEC_ROUTE_109 */ {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0},
-/* MAPSEC_ROUTE_110 */ {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0},
-/* MAPSEC_ROUTE_111 */ {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0},
-/* MAPSEC_ROUTE_112 */ {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0},
-/* MAPSEC_ROUTE_113 */ {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0},
-/* MAPSEC_ROUTE_114 */ {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0},
-/* MAPSEC_ROUTE_115 */ {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0},
-/* MAPSEC_ROUTE_116 */ {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0},
-/* MAPSEC_ROUTE_117 */ {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0},
-/* MAPSEC_ROUTE_118 */ {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0},
-/* MAPSEC_ROUTE_119 */ {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0},
-/* MAPSEC_ROUTE_120 */ {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0},
-/* MAPSEC_ROUTE_121 */ {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0},
-/* MAPSEC_ROUTE_122 */ {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0},
-/* MAPSEC_ROUTE_123 */ {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0},
-/* MAPSEC_ROUTE_124 */ {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0},
-/* MAPSEC_ROUTE_125 */ {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0},
-/* MAPSEC_ROUTE_126 */ {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0},
-/* MAPSEC_ROUTE_127 */ {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0},
-/* MAPSEC_ROUTE_128 */ {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0},
-/* MAPSEC_ROUTE_129 */ {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0},
-/* MAPSEC_ROUTE_130 */ {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0},
-/* MAPSEC_ROUTE_131 */ {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0},
-/* MAPSEC_ROUTE_132 */ {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0},
-/* MAPSEC_ROUTE_133 */ {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0},
-/* MAPSEC_ROUTE_134 */ {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0},
+ {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
+ {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
+ {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
+ {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN},
+ {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN},
+ {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN},
+ {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN},
+ {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY},
+ {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY},
+ {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY},
+ {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY},
+ {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY},
+ {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY},
+ {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY},
+ {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY},
+ {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1},
+ {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0},
+ {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0},
+ {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0},
+ {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0},
+ {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0},
+ {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0},
+ {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0},
+ {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0},
+ {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0},
+ {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0},
+ {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0},
+ {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0},
+ {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0},
+ {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0},
+ {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0},
+ {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0},
+ {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0},
+ {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0},
+ {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0},
+ {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0},
+ {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0},
+ {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0},
+ {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0},
+ {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0},
+ {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0},
+ {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0},
+ {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0},
+ {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0},
+ {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0},
+ {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0},
+ {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0},
+ {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0},
+ {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0},
+ {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0},
};
static const u8 *const sEverGrandeCityAreaNames[] =