MAP_GROUP/NUM constants; remove erroneous comment

1 files changed, 55 insertions, 57 deletions

diff --git a/src/region_map.c b/src/region_map.c
index c669776e3..4bd89dd18 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1262,59 +1262,58 @@ static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map
 static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
 static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-// MAP_GROUP, MAP_NUM, HEAL_LOCATION
-static const u8 sMapHealLocationIndexes[][3] =
-{
-/* MAPSEC_LITTLEROOT_TOWN  */    {0,  9, HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
-/* MAPSEC_OLDALE_TOWN      */    {0, 10, HEAL_LOCATION_OLDALE_TOWN},
-/* MAPSEC_DEWFORD_TOWN     */    {0, 11, HEAL_LOCATION_DEWFORD_TOWN},
-/* MAPSEC_LAVARIDGE_TOWN   */    {0, 12, HEAL_LOCATION_LAVARIDGE_TOWN},
-/* MAPSEC_FALLARBOR_TOWN   */    {0, 13, HEAL_LOCATION_FALLARBOR_TOWN},
-/* MAPSEC_VERDANTURF_TOWN  */    {0, 14, HEAL_LOCATION_VERDANTURF_TOWN},
-/* MAPSEC_PACIFIDLOG_TOWN  */    {0, 15, HEAL_LOCATION_PACIFIDLOG_TOWN},
-/* MAPSEC_PETALBURG_CITY   */    {0,  0, HEAL_LOCATION_PETALBURG_CITY},
-/* MAPSEC_SLATEPORT_CITY   */    {0,  1, HEAL_LOCATION_SLATEPORT_CITY},
-/* MAPSEC_MAUVILLE_CITY    */    {0,  2, HEAL_LOCATION_MAUVILLE_CITY},
-/* MAPSEC_RUSTBORO_CITY    */    {0,  3, HEAL_LOCATION_RUSTBORO_CITY},
-/* MAPSEC_FORTREE_CITY     */    {0,  4, HEAL_LOCATION_FORTREE_CITY},
-/* MAPSEC_LILYCOVE_CITY    */    {0,  5, HEAL_LOCATION_LILYCOVE_CITY},
-/* MAPSEC_MOSSDEEP_CITY    */    {0,  6, HEAL_LOCATION_MOSSDEEP_CITY},
-/* MAPSEC_SOOTOPOLIS_CITY  */    {0,  7, HEAL_LOCATION_SOOTOPOLIS_CITY},
-/* MAPSEC_EVER_GRANDE_CITY */    {0,  8, HEAL_LOCATION_EVER_GRANDE_CITY_1},
-/* MAPSEC_ROUTE_101 */    {0, 16,  0},
-/* MAPSEC_ROUTE_102 */    {0, 17,  0},
-/* MAPSEC_ROUTE_103 */    {0, 18,  0},
-/* MAPSEC_ROUTE_104 */    {0, 19,  0},
-/* MAPSEC_ROUTE_105 */    {0, 20,  0},
-/* MAPSEC_ROUTE_106 */    {0, 21,  0},
-/* MAPSEC_ROUTE_107 */    {0, 22,  0},
-/* MAPSEC_ROUTE_108 */    {0, 23,  0},
-/* MAPSEC_ROUTE_109 */    {0, 24,  0},
-/* MAPSEC_ROUTE_110 */    {0, 25,  0},
-/* MAPSEC_ROUTE_111 */    {0, 26,  0},
-/* MAPSEC_ROUTE_112 */    {0, 27,  0},
-/* MAPSEC_ROUTE_113 */    {0, 28,  0},
-/* MAPSEC_ROUTE_114 */    {0, 29,  0},
-/* MAPSEC_ROUTE_115 */    {0, 30,  0},
-/* MAPSEC_ROUTE_116 */    {0, 31,  0},
-/* MAPSEC_ROUTE_117 */    {0, 32,  0},
-/* MAPSEC_ROUTE_118 */    {0, 33,  0},
-/* MAPSEC_ROUTE_119 */    {0, 34,  0},
-/* MAPSEC_ROUTE_120 */    {0, 35,  0},
-/* MAPSEC_ROUTE_121 */    {0, 36,  0},
-/* MAPSEC_ROUTE_122 */    {0, 37,  0},
-/* MAPSEC_ROUTE_123 */    {0, 38,  0},
-/* MAPSEC_ROUTE_124 */    {0, 39,  0},
-/* MAPSEC_ROUTE_125 */    {0, 40,  0},
-/* MAPSEC_ROUTE_126 */    {0, 41,  0},
-/* MAPSEC_ROUTE_127 */    {0, 42,  0},
-/* MAPSEC_ROUTE_128 */    {0, 43,  0},
-/* MAPSEC_ROUTE_129 */    {0, 44,  0},
-/* MAPSEC_ROUTE_130 */    {0, 45,  0},
-/* MAPSEC_ROUTE_131 */    {0, 46,  0},
-/* MAPSEC_ROUTE_132 */    {0, 47,  0},
-/* MAPSEC_ROUTE_133 */    {0, 48,  0},
-/* MAPSEC_ROUTE_134 */    {0, 49,  0},
+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},
 };
 
 static const u8 *const sEverGrandeCityAreaNames[] =
@@ -1336,7 +1335,6 @@ static const struct MultiPartMapSection sMultiPartMapSections[1] =
     {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY},
 };
 
-// what in the hell is this?
 static struct UnknownStruct3 *const sFlyDataPtr = (struct UnknownStruct3 *)gSharedMem;
 
 static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2};
@@ -1733,10 +1731,10 @@ void sub_80FC69C(void)
                 sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1);
                 break;
             default:
-                if (sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2] != 0)
-                    sub_8053538(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][2]);
+                if (sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2] != 0)
+                    sub_8053538(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2]);
                 else
-                    warp1_set_2(sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocationIndexes[sFlyDataPtr->regionMap.mapSectionId][1], -1);
+                    warp1_set_2(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][1], -1);
                 break;
             }
             sub_80865BC();