Correct region map section constants

1 files changed, 28 insertions, 26 deletions

diff --git a/src/roamer.c b/src/roamer.c
index 6ad009e8b..b42855644 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -4,6 +4,8 @@
 #include "overworld.h"
 #include "field_specials.h"
 #include "constants/species.h"
+#include "constants/maps.h"
+#include "constants/region_map.h"
 
 EWRAM_DATA u8 sLocationHistory[3][2] = {};
 EWRAM_DATA u8 sRoamerLocation[2] = {};
@@ -17,31 +19,31 @@ enum
 };
 
 const u8 sRoamerLocations[][7] = {
-    {0x13, 0x14, 0x27, 0x29, 0xff, 0xff, 0xff},
-    {0x14, 0x13, 0x15, 0x29, 0xff, 0xff, 0xff},
-    {0x15, 0x14, 0x16, 0xff, 0xff, 0xff, 0xff},
-    {0x16, 0x15, 0x17, 0x1b, 0x2b, 0xff, 0xff},
-    {0x17, 0x16, 0x18, 0x19, 0x1a, 0x1b, 0x2b},
-    {0x18, 0x17, 0x19, 0x1a, 0x1d, 0xff, 0xff},
-    {0x19, 0x17, 0x18, 0x1a, 0x22, 0xff, 0xff},
-    {0x1a, 0x17, 0x18, 0x19, 0x1c, 0x1e, 0xff},
-    {0x1b, 0x16, 0x17, 0x1c, 0x2b, 0xff, 0xff},
-    {0x1c, 0x1a, 0x1b, 0x1e, 0xff, 0xff, 0xff},
-    {0x1d, 0x18, 0x1e, 0xff, 0xff, 0xff, 0xff},
-    {0x1e, 0x1c, 0x1d, 0x1f, 0xff, 0xff, 0xff},
-    {0x1f, 0x1e, 0x20, 0xff, 0xff, 0xff, 0xff},
-    {0x20, 0x1f, 0x21, 0xff, 0xff, 0xff, 0xff},
-    {0x21, 0x20, 0x24, 0x25, 0xff, 0xff, 0xff},
-    {0x22, 0x19, 0x23, 0xff, 0xff, 0xff, 0xff},
-    {0x23, 0x22, 0x24, 0xff, 0xff, 0xff, 0xff},
-    {0x24, 0x21, 0x23, 0x25, 0xff, 0xff, 0xff},
-    {0x25, 0x21, 0x24, 0x26, 0xff, 0xff, 0xff},
-    {0x26, 0x25, 0x27, 0xff, 0xff, 0xff, 0xff},
-    {0x27, 0x13, 0x26, 0xff, 0xff, 0xff, 0xff},
-    {0x29, 0x13, 0x14, 0x2a, 0xff, 0xff, 0xff},
-    {0x2a, 0x29, 0x14, 0xff, 0xff, 0xff, 0xff},
-    {0x2b, 0x16, 0x17, 0x1b, 0xff, 0xff, 0xff},
-    {0x2c, 0x2b, 0x1b, 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE22), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE2), MAP_NUM(ROUTE1), MAP_NUM(ROUTE3), MAP_NUM(ROUTE22), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE3), MAP_NUM(ROUTE2), MAP_NUM(ROUTE4), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE4), MAP_NUM(ROUTE3), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24), 0xff, 0xff},
+    {MAP_NUM(ROUTE5), MAP_NUM(ROUTE4), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE24)},
+    {MAP_NUM(ROUTE6), MAP_NUM(ROUTE5), MAP_NUM(ROUTE7), MAP_NUM(ROUTE8), MAP_NUM(ROUTE11), 0xff, 0xff},
+    {MAP_NUM(ROUTE7), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE8), MAP_NUM(ROUTE16), 0xff, 0xff},
+    {MAP_NUM(ROUTE8), MAP_NUM(ROUTE5), MAP_NUM(ROUTE6), MAP_NUM(ROUTE7), MAP_NUM(ROUTE10), MAP_NUM(ROUTE12), 0xff},
+    {MAP_NUM(ROUTE9), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE10), MAP_NUM(ROUTE24), 0xff, 0xff},
+    {MAP_NUM(ROUTE10), MAP_NUM(ROUTE8), MAP_NUM(ROUTE9), MAP_NUM(ROUTE12), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE11), MAP_NUM(ROUTE6), MAP_NUM(ROUTE12), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE12), MAP_NUM(ROUTE10), MAP_NUM(ROUTE11), MAP_NUM(ROUTE13), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE13), MAP_NUM(ROUTE12), MAP_NUM(ROUTE14), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE14), MAP_NUM(ROUTE13), MAP_NUM(ROUTE15), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE15), MAP_NUM(ROUTE14), MAP_NUM(ROUTE18), MAP_NUM(ROUTE19), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE16), MAP_NUM(ROUTE7), MAP_NUM(ROUTE17), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE17), MAP_NUM(ROUTE16), MAP_NUM(ROUTE18), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE18), MAP_NUM(ROUTE15), MAP_NUM(ROUTE17), MAP_NUM(ROUTE19), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE19), MAP_NUM(ROUTE15), MAP_NUM(ROUTE18), MAP_NUM(ROUTE20), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE20), MAP_NUM(ROUTE19), MAP_NUM(ROUTE21_NORTH), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE21_NORTH), MAP_NUM(ROUTE1), MAP_NUM(ROUTE20), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE22), MAP_NUM(ROUTE1), MAP_NUM(ROUTE2), MAP_NUM(ROUTE23), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE23), MAP_NUM(ROUTE22), MAP_NUM(ROUTE2), 0xff, 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE24), MAP_NUM(ROUTE4), MAP_NUM(ROUTE5), MAP_NUM(ROUTE9), 0xff, 0xff, 0xff},
+    {MAP_NUM(ROUTE25), MAP_NUM(ROUTE24), MAP_NUM(ROUTE9), 0xff, 0xff, 0xff, 0xff},
     {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
 };
 
@@ -233,6 +235,6 @@ u16 GetRoamerLocationMapSectionId(void)
 {
     struct Roamer *roamer = &saveRoamer;
     if (!saveRoamer.active)
-        return 0xC5;
+        return MAPSEC_NONE;
     return get_mapheader_by_bank_and_number(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId;
 }