remove zeros from connection macros

59 files changed, 140 insertions, 136 deletions

diff --git a/asm/macros/map.s b/asm/macros/map.s
index 9c1c72ba3..b51f4f434 100644
--- a/asm/macros/map.s
+++ b/asm/macros/map.s
@@ -101,5 +101,5 @@
 	.4byte connection_\direction
 	.4byte \offset
 	map \map
-	.2byte \filler
+	.space 2
 	.endm
diff --git a/data/maps/DewfordTown/connections.s b/data/maps/DewfordTown/connections.s
index 16ab11dc7..4f47ce304 100644
--- a/data/maps/DewfordTown/connections.s
+++ b/data/maps/DewfordTown/connections.s
@@ -1,6 +1,6 @@
 DewfordTown_MapConnectionsList:: @ 8308650
-	connection up, -60, Route106, 0
-	connection right, 0, Route107, 0
+	connection up, -60, Route106
+	connection right, 0, Route107
 
 DewfordTown_MapConnections:: @ 8308668
 	.4byte 0x2
diff --git a/data/maps/EverGrandeCity/connections.s b/data/maps/EverGrandeCity/connections.s
index bab4d0291..fd81ce46b 100644
--- a/data/maps/EverGrandeCity/connections.s
+++ b/data/maps/EverGrandeCity/connections.s
@@ -1,5 +1,5 @@
 EverGrandeCity_MapConnectionsList:: @ 8308808
-	connection left, 40, Route128, 0
+	connection left, 40, Route128
 
 EverGrandeCity_MapConnections:: @ 8308814
 	.4byte 0x1
diff --git a/data/maps/FallarborTown/connections.s b/data/maps/FallarborTown/connections.s
index b47858951..259d5adf0 100644
--- a/data/maps/FallarborTown/connections.s
+++ b/data/maps/FallarborTown/connections.s
@@ -1,6 +1,6 @@
 FallarborTown_MapConnectionsList:: @ 8308684
-	connection left, 0, Route114, 0
-	connection right, 0, Route113, 0
+	connection left, 0, Route114
+	connection right, 0, Route113
 
 FallarborTown_MapConnections:: @ 830869C
 	.4byte 0x2
diff --git a/data/maps/FortreeCity/connections.s b/data/maps/FortreeCity/connections.s
index 12bf6cea7..3012973d8 100644
--- a/data/maps/FortreeCity/connections.s
+++ b/data/maps/FortreeCity/connections.s
@@ -1,6 +1,6 @@
 FortreeCity_MapConnectionsList:: @ 8308794
-	connection left, 0, Route119, 0
-	connection right, 0, Route120, 0
+	connection left, 0, Route119
+	connection right, 0, Route120
 
 FortreeCity_MapConnections:: @ 83087AC
 	.4byte 0x2
diff --git a/data/maps/LavaridgeTown/connections.s b/data/maps/LavaridgeTown/connections.s
index 2d9d66ec5..b31155ae3 100644
--- a/data/maps/LavaridgeTown/connections.s
+++ b/data/maps/LavaridgeTown/connections.s
@@ -1,5 +1,5 @@
 LavaridgeTown_MapConnectionsList:: @ 8308670
-	connection right, -40, Route112, 0
+	connection right, -40, Route112
 
 LavaridgeTown_MapConnections:: @ 830867C
 	.4byte 0x1
diff --git a/data/maps/LilycoveCity/connections.s b/data/maps/LilycoveCity/connections.s
index ea9fb3442..a476e2de2 100644
--- a/data/maps/LilycoveCity/connections.s
+++ b/data/maps/LilycoveCity/connections.s
@@ -1,6 +1,6 @@
 LilycoveCity_MapConnectionsList:: @ 83087B4
-	connection left, 10, Route121, 0
-	connection right, -10, Route124, 0
+	connection left, 10, Route121
+	connection right, -10, Route124
 
 LilycoveCity_MapConnections:: @ 83087CC
 	.4byte 0x2
diff --git a/data/maps/LittlerootTown/connections.s b/data/maps/LittlerootTown/connections.s
index 771124841..d045d04d7 100644
--- a/data/maps/LittlerootTown/connections.s
+++ b/data/maps/LittlerootTown/connections.s
@@ -1,5 +1,5 @@
 LittlerootTown_MapConnectionsList:: @ 8308610
-	connection up, 0, Route101, 0
+	connection up, 0, Route101
 
 LittlerootTown_MapConnections:: @ 830861C
 	.4byte 0x1
diff --git a/data/maps/MauvilleCity/connections.s b/data/maps/MauvilleCity/connections.s
index bea442a62..07f3649cd 100644
--- a/data/maps/MauvilleCity/connections.s
+++ b/data/maps/MauvilleCity/connections.s
@@ -1,8 +1,8 @@
 MauvilleCity_MapConnectionsList:: @ 8308730
-	connection up, 0, Route111, 0
-	connection down, 0, Route110, 0
-	connection left, 0, Route117, 0
-	connection right, 0, Route118, 0
+	connection up, 0, Route111
+	connection down, 0, Route110
+	connection left, 0, Route117
+	connection right, 0, Route118
 
 MauvilleCity_MapConnections:: @ 8308760
 	.4byte 0x4
diff --git a/data/maps/MossdeepCity/connections.s b/data/maps/MossdeepCity/connections.s
index 340dadb0c..0e654d9cc 100644
--- a/data/maps/MossdeepCity/connections.s
+++ b/data/maps/MossdeepCity/connections.s
@@ -1,7 +1,7 @@
 MossdeepCity_MapConnectionsList:: @ 83087D4
-	connection up, 0, Route125, 0
-	connection down, 0, Route127, 0
-	connection left, -40, Route124, 0
+	connection up, 0, Route125
+	connection down, 0, Route127
+	connection left, -40, Route124
 
 MossdeepCity_MapConnections:: @ 83087F8
 	.4byte 0x3
diff --git a/data/maps/OldaleTown/connections.s b/data/maps/OldaleTown/connections.s
index 4515e33c3..fc5495101 100644
--- a/data/maps/OldaleTown/connections.s
+++ b/data/maps/OldaleTown/connections.s
@@ -1,7 +1,7 @@
 OldaleTown_MapConnectionsList:: @ 8308624
-	connection up, 0, Route103, 0
-	connection down, 0, Route101, 0
-	connection left, 0, Route102, 0
+	connection up, 0, Route103
+	connection down, 0, Route101
+	connection left, 0, Route102
 
 OldaleTown_MapConnections:: @ 8308648
 	.4byte 0x3
diff --git a/data/maps/PacifidlogTown/connections.s b/data/maps/PacifidlogTown/connections.s
index aff24c57a..3c0ae1a62 100644
--- a/data/maps/PacifidlogTown/connections.s
+++ b/data/maps/PacifidlogTown/connections.s
@@ -1,6 +1,6 @@
 PacifidlogTown_MapConnectionsList:: @ 83086C4
-	connection left, 0, Route132, 0
-	connection right, 0, Route131, 0
+	connection left, 0, Route132
+	connection right, 0, Route131
 
 PacifidlogTown_MapConnections:: @ 83086DC
 	.4byte 0x2
diff --git a/data/maps/PetalburgCity/connections.s b/data/maps/PetalburgCity/connections.s
index e74872a8f..cabded017 100644
--- a/data/maps/PetalburgCity/connections.s
+++ b/data/maps/PetalburgCity/connections.s
@@ -1,6 +1,6 @@
 PetalburgCity_MapConnectionsList:: @ 83086E4
-	connection left, -50, Route104, 0
-	connection right, 10, Route102, 0
+	connection left, -50, Route104
+	connection right, 10, Route102
 
 PetalburgCity_MapConnections:: @ 83086FC
 	.4byte 0x2
diff --git a/data/maps/Route101/connections.s b/data/maps/Route101/connections.s
index 48c904606..78f73238b 100644
--- a/data/maps/Route101/connections.s
+++ b/data/maps/Route101/connections.s
@@ -1,6 +1,6 @@
 Route101_MapConnectionsList:: @ 830881C
-	connection up, 0, OldaleTown, 0
-	connection down, 0, LittlerootTown, 0
+	connection up, 0, OldaleTown
+	connection down, 0, LittlerootTown
 
 Route101_MapConnections:: @ 8308834
 	.4byte 0x2
diff --git a/data/maps/Route102/connections.s b/data/maps/Route102/connections.s
index e09a253d0..c132f5fa7 100644
--- a/data/maps/Route102/connections.s
+++ b/data/maps/Route102/connections.s
@@ -1,6 +1,6 @@
 Route102_MapConnectionsList:: @ 830883C
-	connection left, -10, PetalburgCity, 0
-	connection right, 0, OldaleTown, 0
+	connection left, -10, PetalburgCity
+	connection right, 0, OldaleTown
 
 Route102_MapConnections:: @ 8308854
 	.4byte 0x2
diff --git a/data/maps/Route103/connections.s b/data/maps/Route103/connections.s
index 5fd4660d1..1510b33d2 100644
--- a/data/maps/Route103/connections.s
+++ b/data/maps/Route103/connections.s
@@ -1,6 +1,6 @@
 Route103_MapConnectionsList:: @ 830885C
-	connection down, 0, OldaleTown, 0
-	connection right, -60, Route110, 0
+	connection down, 0, OldaleTown
+	connection right, -60, Route110
 
 Route103_MapConnections:: @ 8308874
 	.4byte 0x2
diff --git a/data/maps/Route104/connections.s b/data/maps/Route104/connections.s
index 61cf71a8a..38085d1a8 100644
--- a/data/maps/Route104/connections.s
+++ b/data/maps/Route104/connections.s
@@ -1,7 +1,7 @@
 Route104_MapConnectionsList:: @ 830887C
-	connection up, 0, RustboroCity, 0
-	connection down, 0, Route105, 0
-	connection right, 50, PetalburgCity, 0
+	connection up, 0, RustboroCity
+	connection down, 0, Route105
+	connection right, 50, PetalburgCity
 
 Route104_MapConnections:: @ 83088A0
 	.4byte 0x3
diff --git a/data/maps/Route105/connections.s b/data/maps/Route105/connections.s
index 533d21a58..6915b9d08 100644
--- a/data/maps/Route105/connections.s
+++ b/data/maps/Route105/connections.s
@@ -1,6 +1,6 @@
 Route105_MapConnectionsList:: @ 83088A8
-	connection up, 0, Route104, 0
-	connection down, 0, Route106, 0
+	connection up, 0, Route104
+	connection down, 0, Route106
 
 Route105_MapConnections:: @ 83088C0
 	.4byte 0x2
diff --git a/data/maps/Route106/connections.s b/data/maps/Route106/connections.s
index 9fe753562..4d041e65c 100644
--- a/data/maps/Route106/connections.s
+++ b/data/maps/Route106/connections.s
@@ -1,6 +1,6 @@
 Route106_MapConnectionsList:: @ 83088C8
-	connection up, 0, Route105, 0
-	connection down, 60, DewfordTown, 0
+	connection up, 0, Route105
+	connection down, 60, DewfordTown
 
 Route106_MapConnections:: @ 83088E0
 	.4byte 0x2
diff --git a/data/maps/Route107/connections.s b/data/maps/Route107/connections.s
index 6d7ec80f7..a3da84672 100644
--- a/data/maps/Route107/connections.s
+++ b/data/maps/Route107/connections.s
@@ -1,6 +1,6 @@
 Route107_MapConnectionsList:: @ 83088E8
-	connection left, 0, DewfordTown, 0
-	connection right, 0, Route108, 0
+	connection left, 0, DewfordTown
+	connection right, 0, Route108
 
 Route107_MapConnections:: @ 8308900
 	.4byte 0x2
diff --git a/data/maps/Route108/connections.s b/data/maps/Route108/connections.s
index ebc1fba52..aba43d804 100644
--- a/data/maps/Route108/connections.s
+++ b/data/maps/Route108/connections.s
@@ -1,6 +1,6 @@
 Route108_MapConnectionsList:: @ 8308908
-	connection left, 0, Route107, 0
-	connection right, -40, Route109, 0
+	connection left, 0, Route107
+	connection right, -40, Route109
 
 Route108_MapConnections:: @ 8308920
 	.4byte 0x2
diff --git a/data/maps/Route109/connections.s b/data/maps/Route109/connections.s
index 49d7299ef..5135e8e8b 100644
--- a/data/maps/Route109/connections.s
+++ b/data/maps/Route109/connections.s
@@ -1,6 +1,6 @@
 Route109_MapConnectionsList:: @ 8308928
-	connection up, 0, SlateportCity, 0
-	connection left, 40, Route108, 0
+	connection up, 0, SlateportCity
+	connection left, 40, Route108
 
 Route109_MapConnections:: @ 8308940
 	.4byte 0x2
diff --git a/data/maps/Route110/connections.s b/data/maps/Route110/connections.s
index 9ace83c42..d0f88deb3 100644
--- a/data/maps/Route110/connections.s
+++ b/data/maps/Route110/connections.s
@@ -1,7 +1,7 @@
 Route110_MapConnectionsList:: @ 8308948
-	connection up, 0, MauvilleCity, 0
-	connection down, 0, SlateportCity, 0
-	connection left, 60, Route103, 0
+	connection up, 0, MauvilleCity
+	connection down, 0, SlateportCity
+	connection left, 60, Route103
 
 Route110_MapConnections:: @ 830896C
 	.4byte 0x3
diff --git a/data/maps/Route111/connections.s b/data/maps/Route111/connections.s
index 65e4effb9..411dea34b 100644
--- a/data/maps/Route111/connections.s
+++ b/data/maps/Route111/connections.s
@@ -1,7 +1,7 @@
 Route111_MapConnectionsList:: @ 8308974
-	connection down, 0, MauvilleCity, 0
-	connection left, 0, Route113, 0
-	connection left, 20, Route112, 0
+	connection down, 0, MauvilleCity
+	connection left, 0, Route113
+	connection left, 20, Route112
 
 Route111_MapConnections:: @ 8308998
 	.4byte 0x3
diff --git a/data/maps/Route112/connections.s b/data/maps/Route112/connections.s
index e60248519..eee04163c 100644
--- a/data/maps/Route112/connections.s
+++ b/data/maps/Route112/connections.s
@@ -1,7 +1,7 @@
 Route112_MapConnectionsList:: @ 83089A0
-	connection up, -60, Route113, 0
-	connection left, 40, LavaridgeTown, 0
-	connection right, -20, Route111, 0
+	connection up, -60, Route113
+	connection left, 40, LavaridgeTown
+	connection right, -20, Route111
 
 Route112_MapConnections:: @ 83089C4
 	.4byte 0x3
diff --git a/data/maps/Route113/connections.s b/data/maps/Route113/connections.s
index 6aeecd35b..ffa7b231d 100644
--- a/data/maps/Route113/connections.s
+++ b/data/maps/Route113/connections.s
@@ -1,7 +1,7 @@
 Route113_MapConnectionsList:: @ 83089CC
-	connection down, 60, Route112, 0
-	connection left, 0, FallarborTown, 0
-	connection right, 0, Route111, 0
+	connection down, 60, Route112
+	connection left, 0, FallarborTown
+	connection right, 0, Route111
 
 Route113_MapConnections:: @ 83089F0
 	.4byte 0x3
diff --git a/data/maps/Route114/connections.s b/data/maps/Route114/connections.s
index 003a8bd90..603c5e4b1 100644
--- a/data/maps/Route114/connections.s
+++ b/data/maps/Route114/connections.s
@@ -1,6 +1,6 @@
 Route114_MapConnectionsList:: @ 83089F8
-	connection left, 40, Route115, 0
-	connection right, 0, FallarborTown, 0
+	connection left, 40, Route115
+	connection right, 0, FallarborTown
 
 Route114_MapConnections:: @ 8308A10
 	.4byte 0x2
diff --git a/data/maps/Route115/connections.s b/data/maps/Route115/connections.s
index ec4999e8c..3886f114f 100644
--- a/data/maps/Route115/connections.s
+++ b/data/maps/Route115/connections.s
@@ -1,6 +1,6 @@
 Route115_MapConnectionsList:: @ 8308A18
-	connection down, 0, RustboroCity, 0
-	connection right, -40, Route114, 0
+	connection down, 0, RustboroCity
+	connection right, -40, Route114
 
 Route115_MapConnections:: @ 8308A30
 	.4byte 0x2
diff --git a/data/maps/Route116/connections.s b/data/maps/Route116/connections.s
index af7df1392..787314054 100644
--- a/data/maps/Route116/connections.s
+++ b/data/maps/Route116/connections.s
@@ -1,6 +1,6 @@
 Route116_MapConnectionsList:: @ 8308A38
-	connection down, 80, VerdanturfTown, 0
-	connection left, 0, RustboroCity, 0
+	connection down, 80, VerdanturfTown
+	connection left, 0, RustboroCity
 
 Route116_MapConnections:: @ 8308A50
 	.4byte 0x2
diff --git a/data/maps/Route117/connections.s b/data/maps/Route117/connections.s
index 044941f91..2de505e01 100644
--- a/data/maps/Route117/connections.s
+++ b/data/maps/Route117/connections.s
@@ -1,6 +1,6 @@
 Route117_MapConnectionsList:: @ 8308A58
-	connection left, 0, VerdanturfTown, 0
-	connection right, 0, MauvilleCity, 0
+	connection left, 0, VerdanturfTown
+	connection right, 0, MauvilleCity
 
 Route117_MapConnections:: @ 8308A70
 	.4byte 0x2
diff --git a/data/maps/Route118/connections.s b/data/maps/Route118/connections.s
index bf3fdbec1..764071baf 100644
--- a/data/maps/Route118/connections.s
+++ b/data/maps/Route118/connections.s
@@ -1,7 +1,7 @@
 Route118_MapConnectionsList:: @ 8308A78
-	connection up, 40, Route119, 0
-	connection left, 0, MauvilleCity, 0
-	connection right, 0, Route123, 0
+	connection up, 40, Route119
+	connection left, 0, MauvilleCity
+	connection right, 0, Route123
 
 Route118_MapConnections:: @ 8308A9C
 	.4byte 0x3
diff --git a/data/maps/Route119/connections.s b/data/maps/Route119/connections.s
index 280b7a31b..26ce12a01 100644
--- a/data/maps/Route119/connections.s
+++ b/data/maps/Route119/connections.s
@@ -1,6 +1,6 @@
 Route119_MapConnectionsList:: @ 8308AA4
-	connection down, -40, Route118, 0
-	connection right, 0, FortreeCity, 0
+	connection down, -40, Route118
+	connection right, 0, FortreeCity
 
 Route119_MapConnections:: @ 8308ABC
 	.4byte 0x2
diff --git a/data/maps/Route120/connections.s b/data/maps/Route120/connections.s
index 085167f26..a0f747c68 100644
--- a/data/maps/Route120/connections.s
+++ b/data/maps/Route120/connections.s
@@ -1,6 +1,6 @@
 Route120_MapConnectionsList:: @ 8308AC4
-	connection left, 0, FortreeCity, 0
-	connection right, 80, Route121, 0
+	connection left, 0, FortreeCity
+	connection right, 80, Route121
 
 Route120_MapConnections:: @ 8308ADC
 	.4byte 0x2
diff --git a/data/maps/Route121/connections.s b/data/maps/Route121/connections.s
index fe4f3adaa..a77f1b828 100644
--- a/data/maps/Route121/connections.s
+++ b/data/maps/Route121/connections.s
@@ -1,7 +1,7 @@
 Route121_MapConnectionsList:: @ 8308AE4
-	connection down, 20, Route122, 0
-	connection left, -80, Route120, 0
-	connection right, -10, LilycoveCity, 0
+	connection down, 20, Route122
+	connection left, -80, Route120
+	connection right, -10, LilycoveCity
 
 Route121_MapConnections:: @ 8308B08
 	.4byte 0x3
diff --git a/data/maps/Route122/connections.s b/data/maps/Route122/connections.s
index f072b14b5..214826c04 100644
--- a/data/maps/Route122/connections.s
+++ b/data/maps/Route122/connections.s
@@ -1,6 +1,6 @@
 Route122_MapConnectionsList:: @ 8308B10
-	connection up, -20, Route121, 0
-	connection down, -100, Route123, 0
+	connection up, -20, Route121
+	connection down, -100, Route123
 
 Route122_MapConnections:: @ 8308B28
 	.4byte 0x2
diff --git a/data/maps/Route123/connections.s b/data/maps/Route123/connections.s
index b801c33ed..cc54683f4 100644
--- a/data/maps/Route123/connections.s
+++ b/data/maps/Route123/connections.s
@@ -1,6 +1,6 @@
 Route123_MapConnectionsList:: @ 8308B30
-	connection up, 100, Route122, 0
-	connection left, 0, Route118, 0
+	connection up, 100, Route122
+	connection left, 0, Route118
 
 Route123_MapConnections:: @ 8308B48
 	.4byte 0x2
diff --git a/data/maps/Route124/connections.s b/data/maps/Route124/connections.s
index 4270fc865..5384926b0 100644
--- a/data/maps/Route124/connections.s
+++ b/data/maps/Route124/connections.s
@@ -1,9 +1,9 @@
 Route124_MapConnectionsList:: @ 8308B50
-	connection down, 0, Route126, 0
-	connection left, 10, LilycoveCity, 0
-	connection right, 0, Route125, 0
-	connection right, 40, MossdeepCity, 0
-	connection dive, 0, Underwater1, 0
+	connection down, 0, Route126
+	connection left, 10, LilycoveCity
+	connection right, 0, Route125
+	connection right, 40, MossdeepCity
+	connection dive, 0, Underwater1
 
 Route124_MapConnections:: @ 8308B8C
 	.4byte 0x5
diff --git a/data/maps/Route125/connections.s b/data/maps/Route125/connections.s
index 5703f3726..33b7c705c 100644
--- a/data/maps/Route125/connections.s
+++ b/data/maps/Route125/connections.s
@@ -1,6 +1,6 @@
 Route125_MapConnectionsList:: @ 8308B94
-	connection down, 0, MossdeepCity, 0
-	connection left, 0, Route124, 0
+	connection down, 0, MossdeepCity
+	connection left, 0, Route124
 
 Route125_MapConnections:: @ 8308BAC
 	.4byte 0x2
diff --git a/data/maps/Route126/connections.s b/data/maps/Route126/connections.s
index 82290ed35..9ff9688af 100644
--- a/data/maps/Route126/connections.s
+++ b/data/maps/Route126/connections.s
@@ -1,7 +1,7 @@
 Route126_MapConnectionsList:: @ 8308BB4
-	connection up, 0, Route124, 0
-	connection right, 0, Route127, 0
-	connection dive, 0, Underwater2, 0
+	connection up, 0, Route124
+	connection right, 0, Route127
+	connection dive, 0, Underwater2
 
 Route126_MapConnections:: @ 8308BD8
 	.4byte 0x3
diff --git a/data/maps/Route127/connections.s b/data/maps/Route127/connections.s
index 9e702c28f..997c98c61 100644
--- a/data/maps/Route127/connections.s
+++ b/data/maps/Route127/connections.s
@@ -1,8 +1,8 @@
 Route127_MapConnectionsList:: @ 8308BE0
-	connection up, 0, MossdeepCity, 0
-	connection down, 0, Route128, 0
-	connection left, 0, Route126, 0
-	connection dive, 0, Underwater3, 0
+	connection up, 0, MossdeepCity
+	connection down, 0, Route128
+	connection left, 0, Route126
+	connection dive, 0, Underwater3
 
 Route127_MapConnections:: @ 8308C10
 	.4byte 0x4
diff --git a/data/maps/Route128/connections.s b/data/maps/Route128/connections.s
index b0301dd4f..b187c7f64 100644
--- a/data/maps/Route128/connections.s
+++ b/data/maps/Route128/connections.s
@@ -1,8 +1,8 @@
 Route128_MapConnectionsList:: @ 8308C18
-	connection up, 0, Route127, 0
-	connection down, 0, Route129, 0
-	connection right, -40, EverGrandeCity, 0
-	connection dive, 0, Underwater4, 0
+	connection up, 0, Route127
+	connection down, 0, Route129
+	connection right, -40, EverGrandeCity
+	connection dive, 0, Underwater4
 
 Route128_MapConnections:: @ 8308C48
 	.4byte 0x4
diff --git a/data/maps/Route129/connections.s b/data/maps/Route129/connections.s
index 5c6ea1c5f..7a1db2bc7 100644
--- a/data/maps/Route129/connections.s
+++ b/data/maps/Route129/connections.s
@@ -1,6 +1,6 @@
 Route129_MapConnectionsList:: @ 8308C50
-	connection up, 0, Route128, 0
-	connection left, 0, Route130, 0
+	connection up, 0, Route128
+	connection left, 0, Route130
 
 Route129_MapConnections:: @ 8308C68
 	.4byte 0x2
diff --git a/data/maps/Route130/connections.s b/data/maps/Route130/connections.s
index 4d5bc66c3..211eba7f1 100644
--- a/data/maps/Route130/connections.s
+++ b/data/maps/Route130/connections.s
@@ -1,6 +1,6 @@
 Route130_MapConnectionsList:: @ 8308C70
-	connection left, 0, Route131, 0
-	connection right, 0, Route129, 0
+	connection left, 0, Route131
+	connection right, 0, Route129
 
 Route130_MapConnections:: @ 8308C88
 	.4byte 0x2
diff --git a/data/maps/Route131/connections.s b/data/maps/Route131/connections.s
index 66ef3c16c..a1b1adff7 100644
--- a/data/maps/Route131/connections.s
+++ b/data/maps/Route131/connections.s
@@ -1,6 +1,6 @@
 Route131_MapConnectionsList:: @ 8308C90
-	connection left, 0, PacifidlogTown, 0
-	connection right, 0, Route130, 0
+	connection left, 0, PacifidlogTown
+	connection right, 0, Route130
 
 Route131_MapConnections:: @ 8308CA8
 	.4byte 0x2
diff --git a/data/maps/Route132/connections.s b/data/maps/Route132/connections.s
index 8ba11ce4f..a0aff0a42 100644
--- a/data/maps/Route132/connections.s
+++ b/data/maps/Route132/connections.s
@@ -1,6 +1,6 @@
 Route132_MapConnectionsList:: @ 8308CB0
-	connection left, 0, Route133, 0
-	connection right, 0, PacifidlogTown, 0
+	connection left, 0, Route133
+	connection right, 0, PacifidlogTown
 
 Route132_MapConnections:: @ 8308CC8
 	.4byte 0x2
diff --git a/data/maps/Route133/connections.s b/data/maps/Route133/connections.s
index 594de50fe..979b49ee9 100644
--- a/data/maps/Route133/connections.s
+++ b/data/maps/Route133/connections.s
@@ -1,6 +1,6 @@
 Route133_MapConnectionsList:: @ 8308CD0
-	connection left, 0, Route134, 0
-	connection right, 0, Route132, 0
+	connection left, 0, Route134
+	connection right, 0, Route132
 
 Route133_MapConnections:: @ 8308CE8
 	.4byte 0x2
diff --git a/data/maps/Route134/connections.s b/data/maps/Route134/connections.s
index 80c54c22e..aba5c2c9a 100644
--- a/data/maps/Route134/connections.s
+++ b/data/maps/Route134/connections.s
@@ -1,6 +1,6 @@
 Route134_MapConnectionsList:: @ 8308CF0
-	connection left, 0, SlateportCity, 0
-	connection right, 0, Route133, 0
+	connection left, 0, SlateportCity
+	connection right, 0, Route133
 
 Route134_MapConnections:: @ 8308D08
 	.4byte 0x2
diff --git a/data/maps/RustboroCity/connections.s b/data/maps/RustboroCity/connections.s
index 35ea9b814..fd1fa519c 100644
--- a/data/maps/RustboroCity/connections.s
+++ b/data/maps/RustboroCity/connections.s
@@ -1,7 +1,7 @@
 RustboroCity_MapConnectionsList:: @ 8308768
-	connection up, 0, Route115, 0
-	connection down, 0, Route104, 0
-	connection right, 0, Route116, 0
+	connection up, 0, Route115
+	connection down, 0, Route104
+	connection right, 0, Route116
 
 RustboroCity_MapConnections:: @ 830878C
 	.4byte 0x3
diff --git a/data/maps/SafariZone_Northeast/connections.s b/data/maps/SafariZone_Northeast/connections.s
index 833749a8e..5c9c47793 100644
--- a/data/maps/SafariZone_Northeast/connections.s
+++ b/data/maps/SafariZone_Northeast/connections.s
@@ -1,6 +1,6 @@
 SafariZone_Northeast_MapConnectionsList:: @ 8308DC8
-	connection left, 0, SafariZone_Northwest, 0
-	connection down, 0, SafariZone_Southeast, 0
+	connection left, 0, SafariZone_Northwest
+	connection down, 0, SafariZone_Southeast
 
 SafariZone_Northeast_MapConnections:: @ 8308DE0
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Northwest/connections.s b/data/maps/SafariZone_Northwest/connections.s
index fc5c79480..b36d15bad 100644
--- a/data/maps/SafariZone_Northwest/connections.s
+++ b/data/maps/SafariZone_Northwest/connections.s
@@ -1,6 +1,6 @@
 SafariZone_Northwest_MapConnectionsList:: @ 8308DA8
-	connection right, 0, SafariZone_Northeast, 0
-	connection down, 0, SafariZone_Southwest, 0
+	connection right, 0, SafariZone_Northeast
+	connection down, 0, SafariZone_Southwest
 
 SafariZone_Northwest_MapConnections:: @ 8308DC0
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Southeast/connections.s b/data/maps/SafariZone_Southeast/connections.s
index 1831c69fb..e4782d1aa 100644
--- a/data/maps/SafariZone_Southeast/connections.s
+++ b/data/maps/SafariZone_Southeast/connections.s
@@ -1,6 +1,6 @@
 SafariZone_Southeast_MapConnectionsList:: @ 8308E08
-	connection up, 0, SafariZone_Northeast, 0
-	connection left, 0, SafariZone_Southwest, 0
+	connection up, 0, SafariZone_Northeast
+	connection left, 0, SafariZone_Southwest
 
 SafariZone_Southeast_MapConnections:: @ 8308E20
 	.4byte 0x2
diff --git a/data/maps/SafariZone_Southwest/connections.s b/data/maps/SafariZone_Southwest/connections.s
index 48c65ccf3..a0fea0609 100644
--- a/data/maps/SafariZone_Southwest/connections.s
+++ b/data/maps/SafariZone_Southwest/connections.s
@@ -1,6 +1,6 @@
 SafariZone_Southwest_MapConnectionsList:: @ 8308DE8
-	connection up, 0, SafariZone_Northwest, 0
-	connection right, 0, SafariZone_Southeast, 0
+	connection up, 0, SafariZone_Northwest
+	connection right, 0, SafariZone_Southeast
 
 SafariZone_Southwest_MapConnections:: @ 8308E00
 	.4byte 0x2
diff --git a/data/maps/SlateportCity/connections.s b/data/maps/SlateportCity/connections.s
index 659e02a94..2d3980a8c 100644
--- a/data/maps/SlateportCity/connections.s
+++ b/data/maps/SlateportCity/connections.s
@@ -1,7 +1,7 @@
 SlateportCity_MapConnectionsList:: @ 8308704
-	connection up, 0, Route110, 0
-	connection down, 0, Route109, 0
-	connection right, 0, Route134, 0
+	connection up, 0, Route110
+	connection down, 0, Route109
+	connection right, 0, Route134
 
 SlateportCity_MapConnections:: @ 8308728
 	.4byte 0x3
diff --git a/data/maps/Underwater1/connections.s b/data/maps/Underwater1/connections.s
index 96c6f61ff..65c1db901 100644
--- a/data/maps/Underwater1/connections.s
+++ b/data/maps/Underwater1/connections.s
@@ -1,6 +1,6 @@
 Underwater1_MapConnectionsList:: @ 8308D10
-	connection down, 0, Underwater2, 0
-	connection emerge, 0, Route124, 0
+	connection down, 0, Underwater2
+	connection emerge, 0, Route124
 
 Underwater1_MapConnections:: @ 8308D28
 	.4byte 0x2
diff --git a/data/maps/Underwater2/connections.s b/data/maps/Underwater2/connections.s
index 9aca4b1cf..58a4db314 100644
--- a/data/maps/Underwater2/connections.s
+++ b/data/maps/Underwater2/connections.s
@@ -1,7 +1,7 @@
 Underwater2_MapConnectionsList:: @ 8308D30
-	connection up, 0, Underwater1, 0
-	connection right, 0, Underwater3, 0
-	connection emerge, 0, Route126, 0
+	connection up, 0, Underwater1
+	connection right, 0, Underwater3
+	connection emerge, 0, Route126
 
 Underwater2_MapConnections:: @ 8308D54
 	.4byte 0x3
diff --git a/data/maps/Underwater3/connections.s b/data/maps/Underwater3/connections.s
index 1b57eb6ce..7d6401826 100644
--- a/data/maps/Underwater3/connections.s
+++ b/data/maps/Underwater3/connections.s
@@ -1,7 +1,7 @@
 Underwater3_MapConnectionsList:: @ 8308D5C
-	connection emerge, 0, Route127, 0
-	connection left, 0, Underwater2, 0
-	connection down, 0, Underwater4, 0
+	connection emerge, 0, Route127
+	connection left, 0, Underwater2
+	connection down, 0, Underwater4
 
 Underwater3_MapConnections:: @ 8308D80
 	.4byte 0x3
diff --git a/data/maps/Underwater4/connections.s b/data/maps/Underwater4/connections.s
index ed7346c86..0b9a523ea 100644
--- a/data/maps/Underwater4/connections.s
+++ b/data/maps/Underwater4/connections.s
@@ -1,6 +1,6 @@
 Underwater4_MapConnectionsList:: @ 8308D88
-	connection up, 0, Underwater3, 0
-	connection emerge, 0, Route128, 0
+	connection up, 0, Underwater3
+	connection emerge, 0, Route128
 
 Underwater4_MapConnections:: @ 8308DA0
 	.4byte 0x2
diff --git a/data/maps/VerdanturfTown/connections.s b/data/maps/VerdanturfTown/connections.s
index b5bd990bc..e1c9c2418 100644
--- a/data/maps/VerdanturfTown/connections.s
+++ b/data/maps/VerdanturfTown/connections.s
@@ -1,6 +1,6 @@
 VerdanturfTown_MapConnectionsList:: @ 83086A4
-	connection up, -80, Route116, 0
-	connection right, 0, Route117, 0
+	connection up, -80, Route116
+	connection right, 0, Route117
 
 VerdanturfTown_MapConnections:: @ 83086BC
 	.4byte 0x2
diff --git a/include/global.h b/include/global.h
index bcc4d240d..e90678f0b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -126,7 +126,11 @@ struct SaveBlock1
 {
     struct Coords16 pos;
     struct WarpData location;
-    u8 filler_C[0x26];
+    struct WarpData warp1;
+    struct WarpData warp2;
+    struct WarpData warp3;
+    struct WarpData warp4;
+    u8 filler_2C[0x6];
     u16 mapDataId;
     u8 filler_34[0x45C];
     u32 money;