Port the improved connection macro from pokegold/pokecrystal

42 files changed, 153 insertions, 121 deletions

diff --git a/data/maps/objects/Baadon.asm b/data/maps/objects/Baadon.asm
index f33b6cd..8c56184 100644
--- a/data/maps/objects/Baadon.asm
+++ b/data/maps/objects/Baadon.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Baadon.asm", ROMX
 
 	map_attributes Baadon, BAADON, NORTH | SOUTH | EAST
-	connection north, FontoRoute4, FONTO_ROUTE_4, 0, 0, 10
-	connection south, BaadonRoute1, BAADON_ROUTE_1, 0, 0, 10
-	connection east, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9
+	connection north, FontoRoute4, FONTO_ROUTE_4, 0
+	connection south, BaadonRoute1, BAADON_ROUTE_1, 0
+	connection east, BaadonRoute2, BAADON_ROUTE_2, 0
 
 Baadon_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BaadonRoute1.asm b/data/maps/objects/BaadonRoute1.asm
index eddd672..fccacff 100644
--- a/data/maps/objects/BaadonRoute1.asm
+++ b/data/maps/objects/BaadonRoute1.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BaadonRoute1.asm", ROMX
 
 	map_attributes BaadonRoute1, BAADON_ROUTE_1, NORTH | SOUTH
-	connection north, Baadon, BAADON, 0, 0, 10
-	connection south, West, WEST, -3, 2, 16
+	connection north, Baadon, BAADON, 0
+	connection south, West, WEST, -5
 
 BaadonRoute1_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BaadonRoute2.asm b/data/maps/objects/BaadonRoute2.asm
index 93c9a9f..e632431 100644
--- a/data/maps/objects/BaadonRoute2.asm
+++ b/data/maps/objects/BaadonRoute2.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BaadonRoute2.asm", ROMX
 
 	map_attributes BaadonRoute2, BAADON_ROUTE_2, WEST | EAST
-	connection west, Baadon, BAADON, 0, 0, 9
-	connection east, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 12
+	connection west, Baadon, BAADON, 0
+	connection east, BaadonRoute3, BAADON_ROUTE_3, 0
 
 BaadonRoute2_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BaadonRoute3.asm b/data/maps/objects/BaadonRoute3.asm
index 06b491f..eaca20b 100644
--- a/data/maps/objects/BaadonRoute3.asm
+++ b/data/maps/objects/BaadonRoute3.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BaadonRoute3.asm", ROMX
 
 	map_attributes BaadonRoute3, BAADON_ROUTE_3, SOUTH | WEST
-	connection south, Route15, ROUTE_15, 0, 0, 13
-	connection west, BaadonRoute2, BAADON_ROUTE_2, 0, 0, 9
+	connection south, Route15, ROUTE_15, 0
+	connection west, BaadonRoute2, BAADON_ROUTE_2, 0
 
 BaadonRoute3_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BullForest.asm b/data/maps/objects/BullForest.asm
index 9c7c4f3..2f2f9bf 100644
--- a/data/maps/objects/BullForest.asm
+++ b/data/maps/objects/BullForest.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BullForest.asm", ROMX
 
 	map_attributes BullForest, BULL_FOREST, NORTH | SOUTH | WEST
-	connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5, 0, 10
-	connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5, 0, 10
-	connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9, 0, 9
+	connection north, BullForestRoute3, BULL_FOREST_ROUTE_3, 5
+	connection south, BullForestRoute2, BULL_FOREST_ROUTE_2, 5
+	connection west, BullForestRoute1, BULL_FOREST_ROUTE_1, 9
 
 BullForest_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BullForestRoute1.asm b/data/maps/objects/BullForestRoute1.asm
index ad22484..ceb2ea2 100644
--- a/data/maps/objects/BullForestRoute1.asm
+++ b/data/maps/objects/BullForestRoute1.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BullForestRoute1.asm", ROMX
 
 	map_attributes BullForestRoute1, BULL_FOREST_ROUTE_1, SOUTH | EAST
-	connection south, Route18, ROUTE_18, 0, 0, 10
-	connection east, BullForest, BULL_FOREST, -3, 6, 12
+	connection south, Route18, ROUTE_18, 0
+	connection east, BullForest, BULL_FOREST, -9
 
 BullForestRoute1_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BullForestRoute2.asm b/data/maps/objects/BullForestRoute2.asm
index 615d539..ef6728f 100644
--- a/data/maps/objects/BullForestRoute2.asm
+++ b/data/maps/objects/BullForestRoute2.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BullForestRoute2.asm", ROMX
 
 	map_attributes BullForestRoute2, BULL_FOREST_ROUTE_2, NORTH | SOUTH
-	connection north, BullForest, BULL_FOREST, -3, 2, 16
-	connection south, Stand, STAND, -3, 7, 13
+	connection north, BullForest, BULL_FOREST, -5
+	connection south, Stand, STAND, -10
 
 BullForestRoute2_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/BullForestRoute3.asm b/data/maps/objects/BullForestRoute3.asm
index 1db4c57..87a02f1 100644
--- a/data/maps/objects/BullForestRoute3.asm
+++ b/data/maps/objects/BullForestRoute3.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/BullForestRoute3.asm", ROMX
 
 	map_attributes BullForestRoute3, BULL_FOREST_ROUTE_3, NORTH | SOUTH
-	connection north, North, NORTH, 0, 0, 10
-	connection south, BullForest, BULL_FOREST, -3, 2, 16
+	connection north, North, NORTH, 0
+	connection south, BullForest, BULL_FOREST, -5
 
 BullForestRoute3_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm
index 4e9da3c..011235b 100644
--- a/data/maps/objects/Fonto.asm
+++ b/data/maps/objects/Fonto.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Fonto.asm", ROMX
 
 	map_attributes Fonto, FONTO, NORTH | WEST | EAST
-	connection north, FontoRoute2, FONTO_ROUTE_2, 0, 0, 10
-	connection west, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9
-	connection east, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9
+	connection north, FontoRoute2, FONTO_ROUTE_2, 0
+	connection west, FontoRoute1, FONTO_ROUTE_1, 0
+	connection east, FontoRoute3, FONTO_ROUTE_3, 0
 
 Fonto_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute1.asm b/data/maps/objects/FontoRoute1.asm
index 6218d81..728de9e 100644
--- a/data/maps/objects/FontoRoute1.asm
+++ b/data/maps/objects/FontoRoute1.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute1.asm", ROMX
 
 	map_attributes FontoRoute1, FONTO_ROUTE_1, WEST | EAST
-	connection west, South, SOUTH, 0, 0, 12
-	connection east, Fonto, FONTO, 0, 0, 9
+	connection west, South, SOUTH, 0
+	connection east, Fonto, FONTO, 0
 
 FontoRoute1_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute2.asm b/data/maps/objects/FontoRoute2.asm
index 1c79180..fa7b2dc 100644
--- a/data/maps/objects/FontoRoute2.asm
+++ b/data/maps/objects/FontoRoute2.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute2.asm", ROMX
 
 	map_attributes FontoRoute2, FONTO_ROUTE_2, SOUTH | WEST
-	connection south, Fonto, FONTO, 0, 0, 10
-	connection west, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
+	connection south, Fonto, FONTO, 0
+	connection west, FontoRoute6, FONTO_ROUTE_6, 0
 
 FontoRoute2_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute3.asm b/data/maps/objects/FontoRoute3.asm
index 36dc909..1aced4a 100644
--- a/data/maps/objects/FontoRoute3.asm
+++ b/data/maps/objects/FontoRoute3.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute3.asm", ROMX
 
 	map_attributes FontoRoute3, FONTO_ROUTE_3, WEST | EAST
-	connection west, Fonto, FONTO, 0, 0, 9
-	connection east, FontoRoute4, FONTO_ROUTE_4, 0, 0, 12
+	connection west, Fonto, FONTO, 0
+	connection east, FontoRoute4, FONTO_ROUTE_4, 0
 
 FontoRoute3_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute4.asm b/data/maps/objects/FontoRoute4.asm
index bed27cb..6839a6f 100644
--- a/data/maps/objects/FontoRoute4.asm
+++ b/data/maps/objects/FontoRoute4.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute4.asm", ROMX
 
 	map_attributes FontoRoute4, FONTO_ROUTE_4, SOUTH | WEST
-	connection south, Baadon, BAADON, 0, 0, 10
-	connection west, FontoRoute3, FONTO_ROUTE_3, 0, 0, 9
+	connection south, Baadon, BAADON, 0
+	connection west, FontoRoute3, FONTO_ROUTE_3, 0
 
 FontoRoute4_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute5.asm b/data/maps/objects/FontoRoute5.asm
index 441a773..a52e375 100644
--- a/data/maps/objects/FontoRoute5.asm
+++ b/data/maps/objects/FontoRoute5.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute5.asm", ROMX
 
 	map_attributes FontoRoute5, FONTO_ROUTE_5, SOUTH | EAST
-	connection south, South, SOUTH, -3, 7, 13
-	connection east, FontoRoute6, FONTO_ROUTE_6, 0, 0, 9
+	connection south, South, SOUTH, -10
+	connection east, FontoRoute6, FONTO_ROUTE_6, 0
 
 FontoRoute5_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/FontoRoute6.asm b/data/maps/objects/FontoRoute6.asm
index c3320e7..10d7690 100644
--- a/data/maps/objects/FontoRoute6.asm
+++ b/data/maps/objects/FontoRoute6.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/FontoRoute6.asm", ROMX
 
 	map_attributes FontoRoute6, FONTO_ROUTE_6, WEST | EAST
-	connection west, FontoRoute5, FONTO_ROUTE_5, 0, 0, 12
-	connection east, FontoRoute2, FONTO_ROUTE_2, 0, 0, 12
+	connection west, FontoRoute5, FONTO_ROUTE_5, 0
+	connection east, FontoRoute2, FONTO_ROUTE_2, 0
 
 FontoRoute6_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm
index 2205ced..1207b6a 100644
--- a/data/maps/objects/Haiteku.asm
+++ b/data/maps/objects/Haiteku.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Haiteku.asm", ROMX
 
 	map_attributes Haiteku, HAITEKU, WEST
-	connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0, 0, 9
+	connection west, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 0
 
 Haiteku_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/HaitekuWestRoute.asm b/data/maps/objects/HaitekuWestRoute.asm
index 6facf73..52b9e0d 100644
--- a/data/maps/objects/HaitekuWestRoute.asm
+++ b/data/maps/objects/HaitekuWestRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX
 
 	map_attributes HaitekuWestRoute, HAITEKU_WEST_ROUTE, WEST | EAST
-	connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -3, 15, 12
-	connection east, Haiteku, HAITEKU, 0, 0, 12
+	connection west, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, -18
+	connection east, Haiteku, HAITEKU, 0
 
 HaitekuWestRoute_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/HaitekuWestRouteOcean.asm b/data/maps/objects/HaitekuWestRouteOcean.asm
index 9a4ab79..e3edb54 100644
--- a/data/maps/objects/HaitekuWestRouteOcean.asm
+++ b/data/maps/objects/HaitekuWestRouteOcean.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX
 
 	map_attributes HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, NORTH | EAST
-	connection north, South, SOUTH, -3, 7, 13
-	connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18, 0, 9
+	connection north, South, SOUTH, -10
+	connection east, HaitekuWestRoute, HAITEKU_WEST_ROUTE, 18
 
 HaitekuWestRouteOcean_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Kanto.asm b/data/maps/objects/Kanto.asm
index 60ddd71..6575e28 100644
--- a/data/maps/objects/Kanto.asm
+++ b/data/maps/objects/Kanto.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Kanto.asm", ROMX
 
 	map_attributes Kanto, KANTO, WEST | EAST
-	connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9, 0, 9
-	connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9, 0, 9
+	connection west, RouteSilentEast, ROUTE_SILENT_EAST, 9
+	connection east, KantoEastRoute, KANTO_EAST_ROUTE, 9
 
 Kanto_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/KantoEastRoute.asm b/data/maps/objects/KantoEastRoute.asm
index 00bf8f2..eb8605f 100644
--- a/data/maps/objects/KantoEastRoute.asm
+++ b/data/maps/objects/KantoEastRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/KantoEastRoute.asm", ROMX
 
 	map_attributes KantoEastRoute, KANTO_EAST_ROUTE, NORTH | WEST
-	connection north, StandRoute, STAND_ROUTE, 10, 0, 10
-	connection west, Kanto, KANTO, -3, 6, 15
+	connection north, StandRoute, STAND_ROUTE, 10
+	connection west, Kanto, KANTO, -9
 
 KantoEastRoute_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/MtFuji.asm b/data/maps/objects/MtFuji.asm
index ddae1d3..7271580 100644
--- a/data/maps/objects/MtFuji.asm
+++ b/data/maps/objects/MtFuji.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/MtFuji.asm", ROMX
 
 	map_attributes MtFuji, MT_FUJI, SOUTH
-	connection south, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
+	connection south, MtFujiRoute, MT_FUJI_ROUTE, 0
 
 MtFuji_MapEvents::
 	dw $0 ; unknown
diff --git a/data/maps/objects/MtFujiRoute.asm b/data/maps/objects/MtFujiRoute.asm
index e530dcc..9aad754 100644
--- a/data/maps/objects/MtFujiRoute.asm
+++ b/data/maps/objects/MtFujiRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/MtFujiRoute.asm", ROMX
 
 	map_attributes MtFujiRoute, MT_FUJI_ROUTE, NORTH | SOUTH
-	connection north, MtFuji, MT_FUJI, 0, 0, 10
-	connection south, Prince, PRINCE, 0, 0, 10
+	connection north, MtFuji, MT_FUJI, 0
+	connection south, Prince, PRINCE, 0
 
 MtFujiRoute_MapEvents::
 	dw $0 ; unknown
diff --git a/data/maps/objects/Newtype.asm b/data/maps/objects/Newtype.asm
index a0179d9..6577531 100644
--- a/data/maps/objects/Newtype.asm
+++ b/data/maps/objects/Newtype.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Newtype.asm", ROMX
 
 	map_attributes Newtype, NEWTYPE, NORTH | WEST | EAST
-	connection north, SugarRoute, SUGAR_ROUTE, 5, 0, 10
-	connection west, Route15, ROUTE_15, 0, 0, 9
-	connection east, NewtypeRoute, NEWTYPE_ROUTE, 9, 0, 9
+	connection north, SugarRoute, SUGAR_ROUTE, 5
+	connection west, Route15, ROUTE_15, 0
+	connection east, NewtypeRoute, NEWTYPE_ROUTE, 9
 
 Newtype_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/NewtypeRoute.asm b/data/maps/objects/NewtypeRoute.asm
index eceaf4c..50df1b4 100644
--- a/data/maps/objects/NewtypeRoute.asm
+++ b/data/maps/objects/NewtypeRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/NewtypeRoute.asm", ROMX
 
 	map_attributes NewtypeRoute, NEWTYPE_ROUTE, WEST | EAST
-	connection west, Newtype, NEWTYPE, -3, 6, 12
-	connection east, Route18, ROUTE_18, -3, 33, 12
+	connection west, Newtype, NEWTYPE, -9
+	connection east, Route18, ROUTE_18, -36
 
 NewtypeRoute_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/North.asm b/data/maps/objects/North.asm
index 4675b13..0b236bb 100644
--- a/data/maps/objects/North.asm
+++ b/data/maps/objects/North.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/North.asm", ROMX
 
 	map_attributes North, NORTH, SOUTH
-	connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0, 0, 10
+	connection south, BullForestRoute3, BULL_FOREST_ROUTE_3, 0
 
 North_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/OldCity.asm b/data/maps/objects/OldCity.asm
index 00280e1..ca8bb1e 100644
--- a/data/maps/objects/OldCity.asm
+++ b/data/maps/objects/OldCity.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/OldCity.asm", ROMX
 
 	map_attributes OldCity, OLD_CITY, SOUTH | WEST
-	connection south, Route1P2, ROUTE_1_P2, 5, 0, 10
-	connection west, Route2, ROUTE_2, 5, 0, 9
+	connection south, Route1P2, ROUTE_1_P2, 5
+	connection west, Route2, ROUTE_2, 5
 
 OldCity_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Prince.asm b/data/maps/objects/Prince.asm
index 8923d37..6ad0f8a 100644
--- a/data/maps/objects/Prince.asm
+++ b/data/maps/objects/Prince.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Prince.asm", ROMX
 
 	map_attributes Prince, PRINCE, NORTH | SOUTH
-	connection north, MtFujiRoute, MT_FUJI_ROUTE, 0, 0, 10
-	connection south, PrinceRoute, PRINCE_ROUTE, 0, 0, 10
+	connection north, MtFujiRoute, MT_FUJI_ROUTE, 0
+	connection south, PrinceRoute, PRINCE_ROUTE, 0
 
 Prince_MapEvents::
 	dw $0 ; unknown
diff --git a/data/maps/objects/PrinceRoute.asm b/data/maps/objects/PrinceRoute.asm
index 40ebef3..5eea1ff 100644
--- a/data/maps/objects/PrinceRoute.asm
+++ b/data/maps/objects/PrinceRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/PrinceRoute.asm", ROMX
 
 	map_attributes PrinceRoute, PRINCE_ROUTE, NORTH | SOUTH
-	connection north, Prince, PRINCE, 0, 0, 10
-	connection south, SilentHill, SILENT_HILL, 0, 0, 10
+	connection north, Prince, PRINCE, 0
+	connection south, SilentHill, SILENT_HILL, 0
 
 PrinceRoute_MapEvents::
 	dw $0 ; unknown
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm
index 7f3329e..5fcd48f 100644
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Route15.asm", ROMX
 
 	map_attributes Route15, ROUTE_15, NORTH | EAST
-	connection north, BaadonRoute3, BAADON_ROUTE_3, 0, 0, 10
-	connection east, Newtype, NEWTYPE, 0, 0, 12
+	connection north, BaadonRoute3, BAADON_ROUTE_3, 0
+	connection east, Newtype, NEWTYPE, 0
 
 Route15_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm
index 95d85f5..c83c5e7 100644
--- a/data/maps/objects/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Route18.asm", ROMX
 
 	map_attributes Route18, ROUTE_18, NORTH | WEST
-	connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0, 0, 13
-	connection west, NewtypeRoute, NEWTYPE_ROUTE, 36, 0, 9
+	connection north, BullForestRoute1, BULL_FOREST_ROUTE_1, 0
+	connection west, NewtypeRoute, NEWTYPE_ROUTE, 36
 
 Route18_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Route1P1.asm b/data/maps/objects/Route1P1.asm
index f779b26..0a66c03 100644
--- a/data/maps/objects/Route1P1.asm
+++ b/data/maps/objects/Route1P1.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Route1P1.asm", ROMX
 
 	map_attributes Route1P1, ROUTE_1_P1, WEST | EAST
-	connection west, Route1P2, ROUTE_1_P2, -3, 6, 12
-	connection east, SilentHill, SILENT_HILL, 0, 0, 9
+	connection west, Route1P2, ROUTE_1_P2, -9
+	connection east, SilentHill, SILENT_HILL, 0
 
 Route1P1_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm
index 96b2d46..dd8381d 100644
--- a/data/maps/objects/Route1P2.asm
+++ b/data/maps/objects/Route1P2.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Route1P2.asm", ROMX
 
 	map_attributes Route1P2, ROUTE_1_P2, NORTH | EAST
-	connection north, OldCity, OLD_CITY, -3, 2, 16
-	connection east, Route1P1, ROUTE_1_P1, 9, 0, 9
+	connection north, OldCity, OLD_CITY, -5
+	connection east, Route1P1, ROUTE_1_P1, 9
 
 Route1P2_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm
index f17db86..5480743 100644
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Route2.asm", ROMX
 
 	map_attributes Route2, ROUTE_2, WEST | EAST
-	connection west, West, WEST, -3, 2, 15
-	connection east, OldCity, OLD_CITY, -3, 2, 15
+	connection west, West, WEST, -5
+	connection east, OldCity, OLD_CITY, -5
 
 Route2_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/RouteSilentEast.asm b/data/maps/objects/RouteSilentEast.asm
index 825ee45..fe47b6a 100644
--- a/data/maps/objects/RouteSilentEast.asm
+++ b/data/maps/objects/RouteSilentEast.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/RouteSilentEast.asm", ROMX
 
 	map_attributes RouteSilentEast, ROUTE_SILENT_EAST, WEST | EAST
-	connection west, SilentHill, SILENT_HILL, 0, 0, 9
-	connection east, Kanto, KANTO, -3, 6, 15
+	connection west, SilentHill, SILENT_HILL, 0
+	connection east, Kanto, KANTO, -9
 
 RouteSilentEast_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/SilentHill.asm b/data/maps/objects/SilentHill.asm
index 1e3d49f..daabd30 100644
--- a/data/maps/objects/SilentHill.asm
+++ b/data/maps/objects/SilentHill.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/SilentHill.asm", ROMX
 
 	map_attributes SilentHill, SILENT_HILL, NORTH | WEST | EAST
-	connection north, PrinceRoute, PRINCE_ROUTE, 0, 0, 10
-	connection west, Route1P1, ROUTE_1_P1, 0, 0, 9
-	connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0, 0, 9
+	connection north, PrinceRoute, PRINCE_ROUTE, 0
+	connection west, Route1P1, ROUTE_1_P1, 0
+	connection east, RouteSilentEast, ROUTE_SILENT_EAST, 0
 
 SilentHill_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm
index 8c7dd82..027b283 100644
--- a/data/maps/objects/South.asm
+++ b/data/maps/objects/South.asm
@@ -3,9 +3,9 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/South.asm", ROMX
 
 	map_attributes South, SOUTH, NORTH | SOUTH | EAST
-	connection north, FontoRoute5, FONTO_ROUTE_5, 10, 0, 10
-	connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10, 0, 10
-	connection east, FontoRoute1, FONTO_ROUTE_1, 0, 0, 9
+	connection north, FontoRoute5, FONTO_ROUTE_5, 10
+	connection south, HaitekuWestRouteOcean, HAITEKU_WEST_ROUTE_OCEAN, 10
+	connection east, FontoRoute1, FONTO_ROUTE_1, 0
 
 South_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm
index 730f369..029a4b1 100644
--- a/data/maps/objects/Stand.asm
+++ b/data/maps/objects/Stand.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Stand.asm", ROMX
 
 	map_attributes Stand, STAND, NORTH | SOUTH
-	connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10, 0, 10
-	connection south, StandRoute, STAND_ROUTE, 10, 0, 10
+	connection north, BullForestRoute2, BULL_FOREST_ROUTE_2, 10
+	connection south, StandRoute, STAND_ROUTE, 10
 
 Stand_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/StandRoute.asm b/data/maps/objects/StandRoute.asm
index fabb1ae..140d0af 100644
--- a/data/maps/objects/StandRoute.asm
+++ b/data/maps/objects/StandRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/StandRoute.asm", ROMX
 
 	map_attributes StandRoute, STAND_ROUTE, NORTH | SOUTH
-	connection north, Stand, STAND, -3, 7, 13
-	connection south, KantoEastRoute, KANTO_EAST_ROUTE, -3, 7, 13
+	connection north, Stand, STAND, -10
+	connection south, KantoEastRoute, KANTO_EAST_ROUTE, -10
 
 StandRoute_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/Sugar.asm b/data/maps/objects/Sugar.asm
index 43fd16e..4711e69 100644
--- a/data/maps/objects/Sugar.asm
+++ b/data/maps/objects/Sugar.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/Sugar.asm", ROMX
 
 	map_attributes Sugar, SUGAR, SOUTH
-	connection south, SugarRoute, SUGAR_ROUTE, 0, 0, 10
+	connection south, SugarRoute, SUGAR_ROUTE, 0
 
 Sugar_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/SugarRoute.asm b/data/maps/objects/SugarRoute.asm
index 9f8469a..e5024fd 100644
--- a/data/maps/objects/SugarRoute.asm
+++ b/data/maps/objects/SugarRoute.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/SugarRoute.asm", ROMX
 
 	map_attributes SugarRoute, SUGAR_ROUTE, NORTH | SOUTH
-	connection north, Sugar, SUGAR, 0, 0, 10
-	connection south, Newtype, NEWTYPE, -3, 2, 16
+	connection north, Sugar, SUGAR, 0
+	connection south, Newtype, NEWTYPE, -5
 
 SugarRoute_MapEvents::
 	dw $4000 ; unknown
diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm
index 3884b21..15abadc 100644
--- a/data/maps/objects/West.asm
+++ b/data/maps/objects/West.asm
@@ -3,8 +3,8 @@ INCLUDE "constants.asm"
 SECTION "data/maps/objects/West.asm", ROMX
 
 	map_attributes West, WEST, NORTH | EAST
-	connection north, BaadonRoute1, BAADON_ROUTE_1, 5, 0, 10
-	connection east, Route2, ROUTE_2, 5, 0, 9
+	connection north, BaadonRoute1, BAADON_ROUTE_1, 5
+	connection east, Route2, ROUTE_2, 5
 
 West_MapEvents::
 	dw $4000 ; unknown
diff --git a/macros/maps.asm b/macros/maps.asm
index 8ecc24f..135b8a3 100644
--- a/macros/maps.asm
+++ b/macros/maps.asm
@@ -23,45 +23,77 @@ connection: MACRO
 ;\1: direction
 ;\2: map name
 ;\3: map id
-;\4: final y offset for east/west, x offset for north/south
-;\5: map data y offset for east/west, x offset for north/south
-;\6: strip length
-if "\1" == "north"
-	map_id \3
-	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
-	dw wOverworldMapBlocks + \4 + 3
-	db \6
-	db \3_WIDTH
-	db \3_HEIGHT * 2 - 1
-	db (\4 - \5) * -2
-	dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1
-elif "\1" == "south"
-	map_id \3
-	dw \2_Blocks + \5
-	dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
-	db \6
-	db \3_WIDTH
-	db 0
-	db (\4 - \5) * -2
-	dw wOverworldMapBlocks + \3_WIDTH + 7
-elif "\1" == "west"
-	map_id \3
-	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
-	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
-	db \6
-	db \3_WIDTH
-	db (\4 - \5) * -2
-	db \3_WIDTH * 2 - 1
-	dw wOverworldMapBlocks + \3_WIDTH * 2 + 6
-elif "\1" == "east"
+;\4: offset of the target map relative to the current map
+;    (x offset for east/west, y offset for north/south)
+
+; LEGACY: Support for old connection macro
+if _NARG == 6
+	connection \1, \2, \3, (\4) - (\5)
+else
+
+; Calculate tile offsets for source (current) and target maps
+_src = 0
+_tgt = (\4) + 3
+if _tgt < 0
+_src = -_tgt
+_tgt = 0
+endc
+
+if !STRCMP("\1", "north")
+_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src
+_map = _tgt
+_win = (\3_WIDTH + 6) * \3_HEIGHT + 1
+_y = \3_HEIGHT * 2 - 1
+_x = (\4) * -2
+_len = CURRENT_MAP_WIDTH + 3 - (\4)
+if _len > \3_WIDTH
+_len = \3_WIDTH
+endc
+
+elif !STRCMP("\1", "south")
+_blk = _src
+_map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt
+_win = \3_WIDTH + 7
+_y = 0
+_x = (\4) * -2
+_len = CURRENT_MAP_WIDTH + 3 - (\4)
+if _len > \3_WIDTH
+_len = \3_WIDTH
+endc
+
+elif !STRCMP("\1", "west")
+_blk = (\3_WIDTH * _src) + \3_WIDTH - 3
+_map = (CURRENT_MAP_WIDTH + 6) * _tgt
+_win = (\3_WIDTH + 6) * 2 - 6
+_y = (\4) * -2
+_x = \3_WIDTH * 2 - 1
+_len = CURRENT_MAP_HEIGHT + 3 - (\4)
+if _len > \3_HEIGHT
+_len = \3_HEIGHT
+endc
+
+elif !STRCMP("\1", "east")
+_blk = (\3_WIDTH * _src)
+_map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3
+_win = \3_WIDTH + 7
+_y = (\4) * -2
+_x = 0
+_len = CURRENT_MAP_HEIGHT + 3 - (\4)
+if _len > \3_HEIGHT
+_len = \3_HEIGHT
+endc
+
+else
+fail "Invalid direction for 'connection'."
+endc
+
 	map_id \3
-	dw \2_Blocks + (\3_WIDTH * \5)
-	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
-	db \6
+	dw \2_Blocks + _blk
+	dw wOverworldMapBlocks + _map
+	db _len - _src
 	db \3_WIDTH
-	db (\4 - \5) * -2
-	db 0
-	dw wOverworldMapBlocks + \3_WIDTH + 7
+	db _y, _x
+	dw wOverworldMapBlocks + _win
 endc
 ENDM