map constants

12 files changed, 244 insertions, 244 deletions

diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 3587c008c..21a1fdb09 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -13,7 +13,7 @@
 #include "fieldmap.h"
 #include "fldeff_poison.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "metatile_behavior.h"
 #include "opponent_constants.h"
 #include "palette.h"
@@ -161,283 +161,283 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
 {
     {
         {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
-        MAP_GROUP_ROUTE118,
-        MAP_ID_ROUTE118,
+        MAP_GROUP(MAP_ROUTE118),
+        MAP_NUM(MAP_ROUTE118),
     },
     {
         {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
-        MAP_GROUP_ROUTE111,
-        MAP_ID_ROUTE111,
+        MAP_GROUP(MAP_ROUTE111),
+        MAP_NUM(MAP_ROUTE111),
     },
     {
         {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
-        MAP_GROUP_ROUTE109,
-        MAP_ID_ROUTE109,
+        MAP_GROUP(MAP_ROUTE109),
+        MAP_NUM(MAP_ROUTE109),
     },
     {
         {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
-        MAP_GROUP_ROUTE109,
-        MAP_ID_ROUTE109,
+        MAP_GROUP(MAP_ROUTE109),
+        MAP_NUM(MAP_ROUTE109),
     },
     {
         {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
-        MAP_GROUP_ROUTE124,
-        MAP_ID_ROUTE124,
+        MAP_GROUP(MAP_ROUTE124),
+        MAP_NUM(MAP_ROUTE124),
     },
     {
         {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
-        MAP_GROUP_ROUTE111,
-        MAP_ID_ROUTE111,
+        MAP_GROUP(MAP_ROUTE111),
+        MAP_NUM(MAP_ROUTE111),
     },
     {
         {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
-        MAP_GROUP_ROUTE111,
-        MAP_ID_ROUTE111,
+        MAP_GROUP(MAP_ROUTE111),
+        MAP_NUM(MAP_ROUTE111),
     },
     {
         {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
-        MAP_GROUP_MT_PYRE_6F,
-        MAP_ID_MT_PYRE_6F,
+        MAP_GROUP(MAP_MT_PYRE_6F),
+        MAP_NUM(MAP_MT_PYRE_6F),
     },
     {
         {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
-        MAP_GROUP_ROUTE104,
-        MAP_ID_ROUTE104,
+        MAP_GROUP(MAP_ROUTE104),
+        MAP_NUM(MAP_ROUTE104),
     },
     {
         {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
-        MAP_GROUP_ROUTE121,
-        MAP_ID_ROUTE121,
+        MAP_GROUP(MAP_ROUTE121),
+        MAP_NUM(MAP_ROUTE121),
     },
     {
         {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
-        MAP_GROUP_ROUTE104,
-        MAP_ID_ROUTE104,
+        MAP_GROUP(MAP_ROUTE104),
+        MAP_NUM(MAP_ROUTE104),
     },
     {
         {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
-        MAP_GROUP_ROUTE114,
-        MAP_ID_ROUTE114,
+        MAP_GROUP(MAP_ROUTE114),
+        MAP_NUM(MAP_ROUTE114),
     },
     {
         {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
-        MAP_GROUP_ROUTE107,
-        MAP_ID_ROUTE107,
+        MAP_GROUP(MAP_ROUTE107),
+        MAP_NUM(MAP_ROUTE107),
     },
     {
         {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
-        MAP_GROUP_ROUTE115,
-        MAP_ID_ROUTE115,
+        MAP_GROUP(MAP_ROUTE115),
+        MAP_NUM(MAP_ROUTE115),
     },
     {
         {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
-        MAP_GROUP_ROUTE118,
-        MAP_ID_ROUTE118,
+        MAP_GROUP(MAP_ROUTE118),
+        MAP_NUM(MAP_ROUTE118),
     },
     {
         {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
-        MAP_GROUP_ROUTE114,
-        MAP_ID_ROUTE114,
+        MAP_GROUP(MAP_ROUTE114),
+        MAP_NUM(MAP_ROUTE114),
     },
     {
         {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
-        MAP_GROUP_JAGGED_PASS,
-        MAP_ID_JAGGED_PASS,
+        MAP_GROUP(MAP_JAGGED_PASS),
+        MAP_NUM(MAP_JAGGED_PASS),
     },
     {
         {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
-        MAP_GROUP_METEOR_FALLS_1F_2R,
-        MAP_ID_METEOR_FALLS_1F_2R,
+        MAP_GROUP(MAP_METEOR_FALLS_1F_2R),
+        MAP_NUM(MAP_METEOR_FALLS_1F_2R),
     },
     {
         {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
-        MAP_GROUP_ROUTE120,
-        MAP_ID_ROUTE120,
+        MAP_GROUP(MAP_ROUTE120),
+        MAP_NUM(MAP_ROUTE120),
     },
     {
         {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
-        MAP_GROUP_ROUTE123,
-        MAP_ID_ROUTE123,
+        MAP_GROUP(MAP_ROUTE123),
+        MAP_NUM(MAP_ROUTE123),
     },
     {
         {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
-        MAP_GROUP_ROUTE123,
-        MAP_ID_ROUTE123,
+        MAP_GROUP(MAP_ROUTE123),
+        MAP_NUM(MAP_ROUTE123),
     },
     {
         {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
-        MAP_GROUP_ROUTE121,
-        MAP_ID_ROUTE121,
+        MAP_GROUP(MAP_ROUTE121),
+        MAP_NUM(MAP_ROUTE121),
     },
     {
         {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
-        MAP_GROUP_ROUTE116,
-        MAP_ID_ROUTE116,
+        MAP_GROUP(MAP_ROUTE116),
+        MAP_NUM(MAP_ROUTE116),
     },
     {
         {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
-        MAP_GROUP_ROUTE116,
-        MAP_ID_ROUTE116,
+        MAP_GROUP(MAP_ROUTE116),
+        MAP_NUM(MAP_ROUTE116),
     },
     {
         {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
-        MAP_GROUP_ROUTE117,
-        MAP_ID_ROUTE117,
+        MAP_GROUP(MAP_ROUTE117),
+        MAP_NUM(MAP_ROUTE117),
     },
     {
         {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
-        MAP_GROUP_ROUTE110,
-        MAP_ID_ROUTE110,
+        MAP_GROUP(MAP_ROUTE110),
+        MAP_NUM(MAP_ROUTE110),
     },
     {
         {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
-        MAP_GROUP_ROUTE103,
-        MAP_ID_ROUTE103,
+        MAP_GROUP(MAP_ROUTE103),
+        MAP_NUM(MAP_ROUTE103),
     },
     {
         {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
-        MAP_GROUP_ROUTE115,
-        MAP_ID_ROUTE115,
+        MAP_GROUP(MAP_ROUTE115),
+        MAP_NUM(MAP_ROUTE115),
     },
     {
         {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
-        MAP_GROUP_MT_CHIMNEY,
-        MAP_ID_MT_CHIMNEY,
+        MAP_GROUP(MAP_MT_CHIMNEY),
+        MAP_NUM(MAP_MT_CHIMNEY),
     },
     {
         {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
-        MAP_GROUP_ROUTE102,
-        MAP_ID_ROUTE102,
+        MAP_GROUP(MAP_ROUTE102),
+        MAP_NUM(MAP_ROUTE102),
     },
     {
         {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
-        MAP_GROUP_ROUTE106,
-        MAP_ID_ROUTE106,
+        MAP_GROUP(MAP_ROUTE106),
+        MAP_NUM(MAP_ROUTE106),
     },
     {
         {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
-        MAP_GROUP_ROUTE110,
-        MAP_ID_ROUTE110,
+        MAP_GROUP(MAP_ROUTE110),
+        MAP_NUM(MAP_ROUTE110),
     },
     {
         {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
-        MAP_GROUP_ROUTE110,
-        MAP_ID_ROUTE110,
+        MAP_GROUP(MAP_ROUTE110),
+        MAP_NUM(MAP_ROUTE110),
     },
     {
         {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
-        MAP_GROUP_ROUTE128,
-        MAP_ID_ROUTE128,
+        MAP_GROUP(MAP_ROUTE128),
+        MAP_NUM(MAP_ROUTE128),
     },
     {
         {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
-        MAP_GROUP_ROUTE128,
-        MAP_ID_ROUTE128,
+        MAP_GROUP(MAP_ROUTE128),
+        MAP_NUM(MAP_ROUTE128),
     },
     {
         {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
-        MAP_GROUP_ROUTE117,
-        MAP_ID_ROUTE117,
+        MAP_GROUP(MAP_ROUTE117),
+        MAP_NUM(MAP_ROUTE117),
     },
     {
         {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
-        MAP_GROUP_ROUTE117,
-        MAP_ID_ROUTE117,
+        MAP_GROUP(MAP_ROUTE117),
+        MAP_NUM(MAP_ROUTE117),
     },
     {
         {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
-        MAP_GROUP_METEOR_FALLS_1F_2R,
-        MAP_ID_METEOR_FALLS_1F_2R,
+        MAP_GROUP(MAP_METEOR_FALLS_1F_2R),
+        MAP_NUM(MAP_METEOR_FALLS_1F_2R),
     },
     {
         {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
-        MAP_GROUP_ROUTE120,
-        MAP_ID_ROUTE120,
+        MAP_GROUP(MAP_ROUTE120),
+        MAP_NUM(MAP_ROUTE120),
     },
     {
         {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
-        MAP_GROUP_ROUTE113,
-        MAP_ID_ROUTE113,
+        MAP_GROUP(MAP_ROUTE113),
+        MAP_NUM(MAP_ROUTE113),
     },
     {
         {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
-        MAP_GROUP_ROUTE115,
-        MAP_ID_ROUTE115,
+        MAP_GROUP(MAP_ROUTE115),
+        MAP_NUM(MAP_ROUTE115),
     },
     {
         {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
-        MAP_GROUP_ROUTE113,
-        MAP_ID_ROUTE113,
+        MAP_GROUP(MAP_ROUTE113),
+        MAP_NUM(MAP_ROUTE113),
     },
     {
         {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
-        MAP_GROUP_ROUTE124,
-        MAP_ID_ROUTE124,
+        MAP_GROUP(MAP_ROUTE124),
+        MAP_NUM(MAP_ROUTE124),
     },
     {
         {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
-        MAP_GROUP_JAGGED_PASS,
-        MAP_ID_JAGGED_PASS,
+        MAP_GROUP(MAP_JAGGED_PASS),
+        MAP_NUM(MAP_JAGGED_PASS),
     },
     {
         {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
-        MAP_GROUP_ROUTE103,
-        MAP_ID_ROUTE103,
+        MAP_GROUP(MAP_ROUTE103),
+        MAP_NUM(MAP_ROUTE103),
     },
     {
         {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
-        MAP_GROUP_ROUTE125,
-        MAP_ID_ROUTE125,
+        MAP_GROUP(MAP_ROUTE125),
+        MAP_NUM(MAP_ROUTE125),
     },
     {
         {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
-        MAP_GROUP_ROUTE110,
-        MAP_ID_ROUTE110,
+        MAP_GROUP(MAP_ROUTE110),
+        MAP_NUM(MAP_ROUTE110),
     },
     {
         {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
-        MAP_GROUP_ROUTE117,
-        MAP_ID_ROUTE117,
+        MAP_GROUP(MAP_ROUTE117),
+        MAP_NUM(MAP_ROUTE117),
     },
     {
         {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
-        MAP_GROUP_ROUTE117,
-        MAP_ID_ROUTE117,
+        MAP_GROUP(MAP_ROUTE117),
+        MAP_NUM(MAP_ROUTE117),
     },
     {
         {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
-        MAP_GROUP_ROUTE119,
-        MAP_ID_ROUTE119,
+        MAP_GROUP(MAP_ROUTE119),
+        MAP_NUM(MAP_ROUTE119),
     },
     {
         {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
-        MAP_GROUP_ROUTE119,
-        MAP_ID_ROUTE119,
+        MAP_GROUP(MAP_ROUTE119),
+        MAP_NUM(MAP_ROUTE119),
     },
     {
         {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
-        MAP_GROUP_ROUTE104,
-        MAP_ID_ROUTE104,
+        MAP_GROUP(MAP_ROUTE104),
+        MAP_NUM(MAP_ROUTE104),
     },
     {
         {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
-        MAP_GROUP_PETALBURG_WOODS,
-        MAP_ID_PETALBURG_WOODS,
+        MAP_GROUP(MAP_PETALBURG_WOODS),
+        MAP_NUM(MAP_PETALBURG_WOODS),
     },
     {
         {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
-        MAP_GROUP_ROUTE112,
-        MAP_ID_ROUTE112,
+        MAP_GROUP(MAP_ROUTE112),
+        MAP_NUM(MAP_ROUTE112),
     },
     {
         {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
-        MAP_GROUP_ABANDONED_SHIP_ROOMS2_1F,
-        MAP_ID_ABANDONED_SHIP_ROOMS2_1F,
+        MAP_GROUP(MAP_ABANDONED_SHIP_ROOMS2_1F),
+        MAP_NUM(MAP_ABANDONED_SHIP_ROOMS2_1F),
     },
     {
         {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
-        MAP_GROUP_VICTORY_ROAD_1F,
-        MAP_ID_VICTORY_ROAD_1F,
+        MAP_GROUP(MAP_VICTORY_ROAD_1F),
+        MAP_NUM(MAP_VICTORY_ROAD_1F),
     },
 };
 
@@ -682,7 +682,7 @@ s8 BattleSetup_GetTerrain(void)
         if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
             return BATTLE_TERRAIN_WATER;
     }
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1.location.mapNum == MAP_ID_ROUTE113)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE113) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE113))
         return BATTLE_TERRAIN_SAND;
     if (GetSav1Weather() == 8)
         return BATTLE_TERRAIN_SAND;
diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c
index f5bb28a73..122747928 100644
--- a/src/field/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
@@ -6,7 +6,7 @@
 #include "fieldmap.h"
 #include "constants/flags.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "rom6.h"
@@ -25,8 +25,8 @@ extern u8 S_OpenRegiceChamber[]; // regiice event script
 bool8 ShouldDoBrailleDigEffect(void)
 {
     if (!FlagGet(SYS_BRAILLE_DIG)
-     && (gSaveBlock1.location.mapGroup == MAP_GROUP_SEALED_CHAMBER_OUTER_ROOM
-     && gSaveBlock1.location.mapNum == MAP_ID_SEALED_CHAMBER_OUTER_ROOM))
+     && (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_SEALED_CHAMBER_OUTER_ROOM)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_SEALED_CHAMBER_OUTER_ROOM)))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3)
             return TRUE;
@@ -68,7 +68,7 @@ bool8 CheckRelicanthWailord(void)
 
 bool8 ShouldDoBrailleStrengthEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
+    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_DESERT_RUINS)))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
             return TRUE;
@@ -98,7 +98,7 @@ void DoBrailleStrengthEffect(void)
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
+    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ANCIENT_TOMB)))
     {
         if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
             return TRUE;
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index 20edbc34f..816de8917 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -14,7 +14,7 @@
 #include "overworld.h"
 #include "sprite.h"
 #include "metatile_behavior.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "map_object_constants.h"
 #include "trainer_see.h"
 
@@ -7054,7 +7054,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, &objectId))
+    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(MAP_PETALBURG_CITY), MAP_NUM(MAP_PETALBURG_CITY), &objectId))
     {
         an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y));
     }
@@ -7065,7 +7065,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, &objectId))
+    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(MAP_PETALBURG_CITY), MAP_NUM(MAP_PETALBURG_CITY), &objectId))
     {
         an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)));
     }
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index f98c81041..41fa146a5 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -11,7 +11,7 @@
 #include "field_camera.h"
 #include "field_player_avatar.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "overworld.h"
 #include "script.h"
 #include "constants/songs.h"
@@ -207,7 +207,7 @@ u16 GetRecordedCyclingRoadResults(void) {
 }
 
 void UpdateCyclingRoadState(void) {
-    if (gUnknown_020297F0.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE && gUnknown_020297F0.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE)
+    if (gUnknown_020297F0.mapNum == MAP_NUM(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE) && gUnknown_020297F0.mapGroup == MAP_GROUP(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
     {
         return;
     }
@@ -259,38 +259,38 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
         case 2:
             if (*varCruiseStepCount < 60)
             {
-                *mapNum = MAP_ID_ROUTE134;
+                *mapNum = MAP_NUM(MAP_ROUTE134);
                 *x = *varCruiseStepCount + 19;
             }
             else if (*varCruiseStepCount < 140)
             {
-                *mapNum = MAP_ID_ROUTE133;
+                *mapNum = MAP_NUM(MAP_ROUTE133);
                 *x = *varCruiseStepCount - 60;
             }
             else
             {
-                *mapNum = MAP_ID_ROUTE132;
+                *mapNum = MAP_NUM(MAP_ROUTE132);
                 *x = *varCruiseStepCount - 140;
             }
             break;
         case 7:
             if (*varCruiseStepCount < 66)
             {
-                *mapNum = MAP_ID_ROUTE132;
+                *mapNum = MAP_NUM(MAP_ROUTE132);
                 *x = 65 - *varCruiseStepCount;
             }
             else if (*varCruiseStepCount < 146) {
-                *mapNum = MAP_ID_ROUTE133;
+                *mapNum = MAP_NUM(MAP_ROUTE133);
                 *x = 145 - *varCruiseStepCount;
             }
             else
             {
-                *mapNum = MAP_ID_ROUTE134;
+                *mapNum = MAP_NUM(MAP_ROUTE134);
                 *x = 224 - *varCruiseStepCount;
             }
             break;
     }
-    *mapGroup = MAP_GROUP_ROUTE132;
+    *mapGroup = MAP_GROUP(MAP_ROUTE132);
     *y = 20;
     return 0;
 }
@@ -702,11 +702,11 @@ void CableCarWarp(void)
 {
     if (gSpecialVar_0x8004 != 0)
     {
-        Overworld_SetWarpDestination(MAP_GROUP_ROUTE112_CABLE_CAR_STATION, MAP_ID_ROUTE112_CABLE_CAR_STATION, -1, 6, 4);
+        Overworld_SetWarpDestination(MAP_GROUP(MAP_ROUTE112_CABLE_CAR_STATION), MAP_NUM(MAP_ROUTE112_CABLE_CAR_STATION), -1, 6, 4);
     }
     else
     {
-        Overworld_SetWarpDestination(MAP_GROUP_MT_CHIMNEY_CABLE_CAR_STATION, MAP_ID_MT_CHIMNEY_CABLE_CAR_STATION, -1, 6, 4);
+        Overworld_SetWarpDestination(MAP_GROUP(MAP_MT_CHIMNEY_CABLE_CAR_STATION), MAP_NUM(MAP_MT_CHIMNEY_CABLE_CAR_STATION), -1, 6, 4);
     }
 }
 
@@ -1001,22 +1001,22 @@ void SetDepartmentStoreFloorVar(void)
     u8 deptStoreFloor;
     switch (gSaveBlock1.warp2.mapNum)
     {
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_1F:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F):
             deptStoreFloor = 0;
             break;
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_2F:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F):
             deptStoreFloor = 1;
             break;
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_3F:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F):
             deptStoreFloor = 2;
             break;
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_4F:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F):
             deptStoreFloor = 3;
             break;
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_5F:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F):
             deptStoreFloor = 4;
             break;
-        case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP:
+        case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP):
             deptStoreFloor = 15;
             break;
         default:
@@ -1881,7 +1881,7 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
 
 u8 sub_810F5BC(void)
 {
-    if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP_RUSTURF_TUNNEL && gSaveBlock1.location.mapNum == MAP_ID_RUSTURF_TUNNEL)
+    if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_RUSTURF_TUNNEL))
     {
         if (FlagGet(0x3a3))
         {
diff --git a/src/field/heal_location.c b/src/field/heal_location.c
index 42bc18567..0b13f251f 100644
--- a/src/field/heal_location.c
+++ b/src/field/heal_location.c
@@ -1,33 +1,33 @@
 #include "global.h"
 #include "heal_location.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 
 #define NUM_HEAL_LOCATIONS 22
 
 static const struct HealLocation sHealLocations[] =
 {
-    {MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2},
-    {MAP_GROUP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2},
-    {MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, 20, 17},
-    {MAP_GROUP_SLATEPORT_CITY, MAP_ID_SLATEPORT_CITY, 19, 20},
-    {MAP_GROUP_MAUVILLE_CITY, MAP_ID_MAUVILLE_CITY, 22, 6},
-    {MAP_GROUP_RUSTBORO_CITY, MAP_ID_RUSTBORO_CITY, 16, 39},
-    {MAP_GROUP_FORTREE_CITY, MAP_ID_FORTREE_CITY, 5, 7},
-    {MAP_GROUP_LILYCOVE_CITY, MAP_ID_LILYCOVE_CITY, 24, 15},
-    {MAP_GROUP_MOSSDEEP_CITY, MAP_ID_MOSSDEEP_CITY, 28, 17},
-    {MAP_GROUP_SOOTOPOLIS_CITY, MAP_ID_SOOTOPOLIS_CITY, 43, 32},
-    {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 27, 49},
-    {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 5, 9},
-    {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 14, 9},
-    {MAP_GROUP_OLDALE_TOWN, MAP_ID_OLDALE_TOWN, 6, 17},
-    {MAP_GROUP_DEWFORD_TOWN, MAP_ID_DEWFORD_TOWN, 2, 11},
-    {MAP_GROUP_LAVARIDGE_TOWN, MAP_ID_LAVARIDGE_TOWN, 9, 7},
-    {MAP_GROUP_FALLARBOR_TOWN, MAP_ID_FALLARBOR_TOWN, 14, 8},
-    {MAP_GROUP_VERDANTURF_TOWN, MAP_ID_VERDANTURF_TOWN, 16, 4},
-    {MAP_GROUP_PACIFIDLOG_TOWN, MAP_ID_PACIFIDLOG_TOWN, 8, 16},
-    {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 18, 6},
-    {MAP_GROUP_BATTLE_TOWER_OUTSIDE, MAP_ID_BATTLE_TOWER_OUTSIDE, 14, 9},
-    {MAP_GROUP_SOUTHERN_ISLAND_EXTERIOR, MAP_ID_SOUTHERN_ISLAND_EXTERIOR, 15, 20},
+    {MAP_GROUP(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2},
+    {MAP_GROUP(MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2},
+    {MAP_GROUP(MAP_PETALBURG_CITY), MAP_NUM(MAP_PETALBURG_CITY), 20, 17},
+    {MAP_GROUP(MAP_SLATEPORT_CITY), MAP_NUM(MAP_SLATEPORT_CITY), 19, 20},
+    {MAP_GROUP(MAP_MAUVILLE_CITY), MAP_NUM(MAP_MAUVILLE_CITY), 22, 6},
+    {MAP_GROUP(MAP_RUSTBORO_CITY), MAP_NUM(MAP_RUSTBORO_CITY), 16, 39},
+    {MAP_GROUP(MAP_FORTREE_CITY), MAP_NUM(MAP_FORTREE_CITY), 5, 7},
+    {MAP_GROUP(MAP_LILYCOVE_CITY), MAP_NUM(MAP_LILYCOVE_CITY), 24, 15},
+    {MAP_GROUP(MAP_MOSSDEEP_CITY), MAP_NUM(MAP_MOSSDEEP_CITY), 28, 17},
+    {MAP_GROUP(MAP_SOOTOPOLIS_CITY), MAP_NUM(MAP_SOOTOPOLIS_CITY), 43, 32},
+    {MAP_GROUP(MAP_EVER_GRANDE_CITY), MAP_NUM(MAP_EVER_GRANDE_CITY), 27, 49},
+    {MAP_GROUP(MAP_LITTLEROOT_TOWN), MAP_NUM(MAP_LITTLEROOT_TOWN), 5, 9},
+    {MAP_GROUP(MAP_LITTLEROOT_TOWN), MAP_NUM(MAP_LITTLEROOT_TOWN), 14, 9},
+    {MAP_GROUP(MAP_OLDALE_TOWN), MAP_NUM(MAP_OLDALE_TOWN), 6, 17},
+    {MAP_GROUP(MAP_DEWFORD_TOWN), MAP_NUM(MAP_DEWFORD_TOWN), 2, 11},
+    {MAP_GROUP(MAP_LAVARIDGE_TOWN), MAP_NUM(MAP_LAVARIDGE_TOWN), 9, 7},
+    {MAP_GROUP(MAP_FALLARBOR_TOWN), MAP_NUM(MAP_FALLARBOR_TOWN), 14, 8},
+    {MAP_GROUP(MAP_VERDANTURF_TOWN), MAP_NUM(MAP_VERDANTURF_TOWN), 16, 4},
+    {MAP_GROUP(MAP_PACIFIDLOG_TOWN), MAP_NUM(MAP_PACIFIDLOG_TOWN), 8, 16},
+    {MAP_GROUP(MAP_EVER_GRANDE_CITY), MAP_NUM(MAP_EVER_GRANDE_CITY), 18, 6},
+    {MAP_GROUP(MAP_BATTLE_TOWER_OUTSIDE), MAP_NUM(MAP_BATTLE_TOWER_OUTSIDE), 14, 9},
+    {MAP_GROUP(MAP_SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(MAP_SOUTHERN_ISLAND_EXTERIOR), 15, 20},
 };
 
 u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum)
diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index 4d5c6478c..b9d694bec 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/menu_helpers.c
@@ -4,7 +4,7 @@
 #include "link.h"
 #include "mail_data.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"
@@ -261,7 +261,7 @@ bool8 sub_80F92F4(u16 itemId)
         return TRUE;
     }
 
-    if (!(gSaveBlock1.location.mapGroup == MAP_GROUP_TRADE_CENTER && gSaveBlock1.location.mapNum == MAP_ID_TRADE_CENTER))
+    if (!(gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_TRADE_CENTER) && gSaveBlock1.location.mapNum == MAP_NUM(MAP_TRADE_CENTER)))
     {
         return TRUE;
     }
diff --git a/src/field/overworld.c b/src/field/overworld.c
index d286a1951..d27d8e06e 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -25,7 +25,7 @@
 #include "link.h"
 #include "load_save.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
@@ -738,9 +738,9 @@ u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void)
 bool32 Overworld_IsBikingAllowed(void)
 {
     // is player in cycling road entrance?
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
-     && (gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
-      || gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE)
+     && (gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE)
+      || gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE)))
         return TRUE;
 
     // is player indoor, in a secret base, or underwater?
@@ -752,11 +752,11 @@ bool32 Overworld_IsBikingAllowed(void)
         return FALSE;
 
     // Thou shalt not bike on the sacred resting grounds of Kyogre/Groudon.
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_SEAFLOOR_CAVERN_ROOM9
-     && gSaveBlock1.location.mapNum == MAP_ID_SEAFLOOR_CAVERN_ROOM9)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_SEAFLOOR_CAVERN_ROOM9)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_SEAFLOOR_CAVERN_ROOM9))
         return FALSE;
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_CAVE_OF_ORIGIN_B4F
-     && gSaveBlock1.location.mapNum == MAP_ID_CAVE_OF_ORIGIN_B4F)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_CAVE_OF_ORIGIN_B4F)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_CAVE_OF_ORIGIN_B4F))
         return FALSE;
 
     return TRUE;
@@ -798,16 +798,16 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
     {
         switch (warp->mapNum)
         {
-        case MAP_ID_LILYCOVE_CITY:
-        case MAP_ID_MOSSDEEP_CITY:
-        case MAP_ID_SOOTOPOLIS_CITY:
-        case MAP_ID_EVER_GRANDE_CITY:
+        case MAP_NUM(MAP_LILYCOVE_CITY):
+        case MAP_NUM(MAP_MOSSDEEP_CITY):
+        case MAP_NUM(MAP_SOOTOPOLIS_CITY):
+        case MAP_NUM(MAP_EVER_GRANDE_CITY):
             return TRUE;
-        case MAP_ID_ROUTE124:
-        case MAP_ID_ROUTE125:
-        case MAP_ID_ROUTE126:
-        case MAP_ID_ROUTE127:
-        case MAP_ID_ROUTE128:
+        case MAP_NUM(MAP_ROUTE124):
+        case MAP_NUM(MAP_ROUTE125):
+        case MAP_NUM(MAP_ROUTE126):
+        case MAP_NUM(MAP_ROUTE127):
+        case MAP_NUM(MAP_ROUTE128):
             return TRUE;
         }
     }
@@ -818,10 +818,10 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
 {
     if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED))
         return FALSE;
-    if (warp->mapGroup != MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F)
+    if (warp->mapGroup != MAP_GROUP(MAP_ROUTE119_WEATHER_INSTITUTE_1F))
         return FALSE;
-    if (warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F
-     || warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F)
+    if (warp->mapNum == MAP_NUM(MAP_ROUTE119_WEATHER_INSTITUTE_1F)
+     || warp->mapNum == MAP_NUM(MAP_ROUTE119_WEATHER_INSTITUTE_2F))
         return TRUE;
     return FALSE;
 }
@@ -841,8 +841,8 @@ u16 GetCurrLocationDefaultMusic(void)
     u16 music;
 
     // Play the desert music only when the sandstorm is active on Route 111.
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE111
-     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE111
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE111)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE111)
      && GetSav1Weather() == 8)
         return BGM_ASHROAD;
 
@@ -869,8 +869,8 @@ u16 GetWarpDestinationMusic(void)
     }
     else
     {
-        if (gSaveBlock1.location.mapGroup == MAP_GROUP_MAUVILLE_CITY
-         && gSaveBlock1.location.mapNum == MAP_ID_MAUVILLE_CITY)
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_MAUVILLE_CITY)
+         && gSaveBlock1.location.mapNum == MAP_NUM(MAP_MAUVILLE_CITY))
             return BGM_DOORO_X1;
         else
             return BGM_GRANROAD;
@@ -1024,8 +1024,8 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter)
 
 void ChooseAmbientCrySpecies(void)
 {
-    if ((gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE130
-     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE130)
+    if ((gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE130)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE130))
      && !IsMirageIslandPresent())
     {
         // Only play water pokemon cries on this route
diff --git a/src/field/region_map.c b/src/field/region_map.c
index df51d6173..5fbe930e1 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -4,7 +4,7 @@
 #include "field_specials.h"
 #include "m4a.h"
 #include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "menu.h"
 #include "palette.h"
 #include "pokemon_menu.h"
@@ -707,9 +707,9 @@ static void InitializeCursorPosition(void)
     u16 r9;
 
     if (gSaveBlock1.location.mapGroup == 25
-     && (gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR
-      || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK
-      || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_ROOMS))
+     && (gSaveBlock1.location.mapNum == MAP_NUM(MAP_SS_TIDAL_CORRIDOR)
+      || gSaveBlock1.location.mapNum == MAP_NUM(MAP_SS_TIDAL_LOWER_DECK)
+      || gSaveBlock1.location.mapNum == MAP_NUM(MAP_SS_TIDAL_ROOMS)))
     {
         sub_80FB600();
         return;
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index c3b6a8a71..c17b604c2 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -3,7 +3,7 @@
 #include "event_data.h"
 #include "field_map_obj.h"
 #include "fieldmap.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
@@ -622,14 +622,14 @@ static EWRAM_DATA u8 gRotatingGate_PuzzleCount = 0;
 
 static int GetCurrentMapRotatingGatePuzzleType(void)
 {
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_FORTREE_CITY_GYM &&
-        gSaveBlock1.location.mapNum == MAP_ID_FORTREE_CITY_GYM)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_FORTREE_CITY_GYM) &&
+        gSaveBlock1.location.mapNum == MAP_NUM(MAP_FORTREE_CITY_GYM))
     {
         return PUZZLE_FORTREE_CITY_GYM;
     }
 
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE6 &&
-        gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE6)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6) &&
+        gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6))
     {
         return PUZZLE_ROUTE110_TRICK_HOUSE_PUZZLE6;
     }
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 257fe4ee7..c1ca10c1f 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -17,7 +17,7 @@
 #include "main.h"
 #include "sound.h"
 #include "constants/songs.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "menu_helpers.h"
@@ -68,30 +68,30 @@ const struct
 
 
 const u8 gUnknown_083D1374[] = {
-    MAP_ID_SECRET_BASE_RED_CAVE1,     0,  1,  3,
-    MAP_ID_SECRET_BASE_RED_CAVE2,     0,  5,  9,
-    MAP_ID_SECRET_BASE_RED_CAVE3,     0,  1,  3,
-    MAP_ID_SECRET_BASE_RED_CAVE4,     0,  7, 13,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   0,  2,  3,
-    MAP_ID_SECRET_BASE_BROWN_CAVE2,   0,  9,  2,
-    MAP_ID_SECRET_BASE_BROWN_CAVE3,   0, 13,  4,
-    MAP_ID_SECRET_BASE_BROWN_CAVE4,   0,  1,  2,
-    MAP_ID_SECRET_BASE_BLUE_CAVE1,    0,  1,  3,
-    MAP_ID_SECRET_BASE_BLUE_CAVE2,    0,  1,  2,
-    MAP_ID_SECRET_BASE_BLUE_CAVE3,    0,  3, 15,
-    MAP_ID_SECRET_BASE_BLUE_CAVE4,    0,  3, 14,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1,  0,  9,  3,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  0,  8,  7,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE3,  0,  3,  6,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE4,  0,  5,  9,
-    MAP_ID_SECRET_BASE_TREE1,         0,  2,  3,
-    MAP_ID_SECRET_BASE_TREE2,         0,  5,  6,
-    MAP_ID_SECRET_BASE_TREE3,         0, 15,  3,
-    MAP_ID_SECRET_BASE_TREE4,         0,  4, 10,
-    MAP_ID_SECRET_BASE_SHRUB1,        0,  3,  3,
-    MAP_ID_SECRET_BASE_SHRUB2,        0,  1,  2,
-    MAP_ID_SECRET_BASE_SHRUB3,        0,  7,  8,
-    MAP_ID_SECRET_BASE_SHRUB4,        0,  9,  6
+    MAP_NUM(MAP_SECRET_BASE_RED_CAVE1),     0,  1,  3,
+    MAP_NUM(MAP_SECRET_BASE_RED_CAVE2),     0,  5,  9,
+    MAP_NUM(MAP_SECRET_BASE_RED_CAVE3),     0,  1,  3,
+    MAP_NUM(MAP_SECRET_BASE_RED_CAVE4),     0,  7, 13,
+    MAP_NUM(MAP_SECRET_BASE_BROWN_CAVE1),   0,  2,  3,
+    MAP_NUM(MAP_SECRET_BASE_BROWN_CAVE2),   0,  9,  2,
+    MAP_NUM(MAP_SECRET_BASE_BROWN_CAVE3),   0, 13,  4,
+    MAP_NUM(MAP_SECRET_BASE_BROWN_CAVE4),   0,  1,  2,
+    MAP_NUM(MAP_SECRET_BASE_BLUE_CAVE1),    0,  1,  3,
+    MAP_NUM(MAP_SECRET_BASE_BLUE_CAVE2),    0,  1,  2,
+    MAP_NUM(MAP_SECRET_BASE_BLUE_CAVE3),    0,  3, 15,
+    MAP_NUM(MAP_SECRET_BASE_BLUE_CAVE4),    0,  3, 14,
+    MAP_NUM(MAP_SECRET_BASE_YELLOW_CAVE1),  0,  9,  3,
+    MAP_NUM(MAP_SECRET_BASE_YELLOW_CAVE2),  0,  8,  7,
+    MAP_NUM(MAP_SECRET_BASE_YELLOW_CAVE3),  0,  3,  6,
+    MAP_NUM(MAP_SECRET_BASE_YELLOW_CAVE4),  0,  5,  9,
+    MAP_NUM(MAP_SECRET_BASE_TREE1),         0,  2,  3,
+    MAP_NUM(MAP_SECRET_BASE_TREE2),         0,  5,  6,
+    MAP_NUM(MAP_SECRET_BASE_TREE3),         0, 15,  3,
+    MAP_NUM(MAP_SECRET_BASE_TREE4),         0,  4, 10,
+    MAP_NUM(MAP_SECRET_BASE_SHRUB1),        0,  3,  3,
+    MAP_NUM(MAP_SECRET_BASE_SHRUB2),        0,  1,  2,
+    MAP_NUM(MAP_SECRET_BASE_SHRUB3),        0,  7,  8,
+    MAP_NUM(MAP_SECRET_BASE_SHRUB4),        0,  9,  6
 };
 
 const struct MenuAction2 gUnknown_083D13D4[] = {
@@ -316,7 +316,7 @@ void sub_80BB970(struct MapEvents *events)
 void sub_80BBA14(void)
 {
     s8 idx = 4 * (gUnknown_020387DC / 10);
-    warp1_set_2(MAP_GROUP_SECRET_BASE_RED_CAVE1, gUnknown_083D1374[idx], gUnknown_083D1374[idx + 1]);
+    warp1_set_2(MAP_GROUP(MAP_SECRET_BASE_RED_CAVE1), gUnknown_083D1374[idx], gUnknown_083D1374[idx + 1]);
 }
 
 void sub_80BBA48(u8 taskid)
@@ -401,7 +401,7 @@ void sub_80BBC78(void)
 
 bool8 CurrentMapIsSecretBase(void)
 {
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_SECRET_BASE_SHRUB4 && (u8)(gSaveBlock1.location.mapNum) <= MAP_ID_SECRET_BASE_SHRUB4)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_SECRET_BASE_SHRUB4) && (u8)(gSaveBlock1.location.mapNum) <= MAP_NUM(MAP_SECRET_BASE_SHRUB4))
         return TRUE;
     return FALSE;
 }
diff --git a/src/field/tv.c b/src/field/tv.c
index 2d345eb6c..15a3f4d4d 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -16,7 +16,7 @@
 #include "pokedex.h"
 #include "naming_screen.h"
 #include "overworld.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "strings.h"
 #include "battle.h"
 #include "link.h"
@@ -26,7 +26,7 @@
 #include "item.h"
 #include "constants/items.h"
 #include "link.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "naming_screen.h"
 #include "pokedex.h"
 #include "region_map.h"
@@ -551,8 +551,8 @@ void UpdateTVScreensOnMap(int width, int height)
     case 2:
         break;
     default:
-        if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-         && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
+         && gSaveBlock1.location.mapNum == MAP_NUM(MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F))
         {
             SetTVMetatilesOnMap(width, height, 0x3);
         }
@@ -1460,16 +1460,16 @@ bool8 IsPriceDiscounted(u8 arg0)
     switch (arg0)
     {
     case 1:
-        if (gSaveBlock1.location.mapGroup == MAP_GROUP_SLATEPORT_CITY
-         && gSaveBlock1.location.mapNum == MAP_ID_SLATEPORT_CITY
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_SLATEPORT_CITY)
+         && gSaveBlock1.location.mapNum == MAP_NUM(MAP_SLATEPORT_CITY)
          && gScriptLastTalked == 0x1a)
             return TRUE;
         else
             return FALSE;
         break;
     case 3:
-        if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
-         && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)
+         && gSaveBlock1.location.mapNum == MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP))
             return TRUE;
         else
             return FALSE;
@@ -2121,16 +2121,16 @@ u32 GetPlayerTrainerId(void)
 
 u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
 {
-    if (gSaveBlock1.location.mapGroup != MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+    if (gSaveBlock1.location.mapGroup != MAP_GROUP(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
         return 0;
     if (gSaveBlock2.playerGender == MALE)
     {
-        if (gSaveBlock1.location.mapNum != MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+        if (gSaveBlock1.location.mapNum != MAP_NUM(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
             return 0;
     }
     else
     {
-        if (gSaveBlock1.location.mapNum != MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F)
+        if (gSaveBlock1.location.mapNum != MAP_NUM(MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F))
             return 0;
     }
     if (FlagGet(SYS_TV_LATI) == 1)
@@ -2142,11 +2142,11 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
 
 void GetMomOrDadStringForTVMessage(void)
 {
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
     {
         if (gSaveBlock2.playerGender == MALE)
         {
-            if (gSaveBlock1.location.mapNum == MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+            if (gSaveBlock1.location.mapNum == MAP_NUM(MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
             {
                 StringCopy(gStringVar1, gOtherText_Mom);
                 VarSet(VAR_0x4003, 1);
@@ -2154,7 +2154,7 @@ void GetMomOrDadStringForTVMessage(void)
         }
         else
         {
-            if (gSaveBlock1.location.mapNum == MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F)
+            if (gSaveBlock1.location.mapNum == MAP_NUM(MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F))
             {
                 StringCopy(gStringVar1, gOtherText_Mom);
                 VarSet(VAR_0x4003, 1);
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index b19b1d4c2..2376f582c 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -5,7 +5,7 @@
 #include "event_data.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "metatile_behavior.h"
 #include "pokeblock.h"
 #include "random.h"
@@ -2953,8 +2953,8 @@ static bool8 CheckFeebas(void)
     u8 route119section = 0;
     u16 waterTileNum;
 
-    if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119
-     && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119)
+    if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE119)
+     && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE119))
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
         x -= 7;