Dump map connections (unlabeled)

4 files changed, 511 insertions, 8 deletions

diff --git a/data/connections.s b/data/connections.s
new file mode 100644
index 000000000..15c02ebbe
--- /dev/null
+++ b/data/connections.s
@@ -0,0 +1,501 @@
+    .include "asm/macros.inc"
+
+    .section .rodata
+
+gUnknown_8352754:: @ 8352754
+	connection up, 0, 0x313
+	connection down, 0, 0x327
+
+gUnknown_835276C:: @ 835276C
+	.4byte 2
+	.4byte gUnknown_8352754
+
+gUnknown_8352774:: @ 8352774
+	connection up, 12, 0x314
+	connection down, 12, 0x313
+	connection left, 10, 0x329
+
+gUnknown_8352798:: @ 8352798
+	.4byte 3
+	.4byte gUnknown_8352774
+
+gUnknown_83527A0:: @ 83527A0
+	connection down, 12, 0x314
+	connection right, 10, 0x315
+
+gUnknown_83527B8:: @ 83527B8
+	.4byte 2
+	.4byte gUnknown_83527A0
+
+gUnknown_83527C0:: @ 83527C0
+	connection up, 12, 0x32B
+	connection down, 0, 0x317
+	connection left, 10, 0x316
+	connection right, 10, 0x31B
+
+gUnknown_83527F0:: @ 83527F0
+	.4byte 4
+	.4byte gUnknown_83527C0
+
+gUnknown_83527F8:: @ 83527F8
+	connection up, 0, 0x31C
+	connection down, 0, 0x31E
+	connection left, 0, 0x31A
+
+gUnknown_835281C:: @ 835281C
+	.4byte 3
+	.4byte gUnknown_83527F8
+
+gUnknown_8352824:: @ 8352824
+	connection up, 12, 0x318
+	connection right, 10, 0x31D
+
+gUnknown_835283C:: @ 835283C
+	.4byte 2
+	.4byte gUnknown_8352824
+
+gUnknown_8352844:: @ 8352844
+	connection left, 10, 0x322
+	connection right, 10, 0x319
+
+gUnknown_835285C:: @ 835285C
+	.4byte 2
+	.4byte gUnknown_8352844
+
+gUnknown_8352864:: @ 8352864
+	connection down, 12, 0x325
+	connection left, 10, 0x324
+	connection right, 10, 0x321
+
+gUnknown_8352888:: @ 8352888
+	.4byte 3
+	.4byte gUnknown_8352864
+
+gUnknown_8352890:: @ 8352890
+	connection up, 0, 0x328
+	connection right, 0, 0x326
+
+gUnknown_83528A8:: @ 83528A8
+	.4byte 2
+	.4byte gUnknown_8352890
+
+gUnknown_83528B0:: @ 83528B0
+	connection down, 0, 0x32A
+
+gUnknown_83528BC:: @ 83528BC
+	.4byte 1
+	.4byte gUnknown_83528B0
+
+gUnknown_83528C4:: @ 83528C4
+	connection up, 0, 0x317
+	connection down, 12, 0x318
+	connection left, 10, 0x319
+	connection right, 10, 0x31A
+
+gUnknown_83528F4:: @ 83528F4
+	.4byte 4
+	.4byte gUnknown_83528C4
+
+gUnknown_83528FC:: @ 83528FC
+	connection up, 0, 0x317
+	connection down, 12, 0x318
+	connection left, 10, 0x319
+	connection right, 10, 0x31A
+
+gUnknown_835292C:: @ 835292C
+	.4byte 4
+	.4byte gUnknown_83528FC
+
+gUnknown_8352934:: @ 8352934
+	connection down, 0, 0x32E
+	connection right, -120, 0x32D
+
+gUnknown_835294C:: @ 835294C
+	.4byte 2
+	.4byte gUnknown_8352934
+
+gUnknown_8352954:: @ 8352954
+	connection up, 24, 0x32F
+
+gUnknown_8352960:: @ 8352960
+	.4byte 1
+	.4byte gUnknown_8352954
+
+gUnknown_8352968:: @ 8352968
+	connection down, 0, 0x331
+	connection left, 0, 0x330
+
+gUnknown_8352980:: @ 8352980
+	.4byte 2
+	.4byte gUnknown_8352968
+
+gUnknown_8352988:: @ 8352988
+	connection up, -48, 0x337
+	connection right, 0, 0x338
+
+gUnknown_83529A0:: @ 83529A0
+	.4byte 2
+	.4byte gUnknown_8352988
+
+gUnknown_83529A8:: @ 83529A8
+	connection up, -48, 0x33E
+	connection down, 0, 0x33F
+
+gUnknown_83529C0:: @ 83529C0
+	.4byte 2
+	.4byte gUnknown_83529A8
+
+gUnknown_83529C8:: @ 83529C8
+	connection right, -40, 0x33C
+
+gUnknown_83529D4:: @ 83529D4
+	.4byte 1
+	.4byte gUnknown_83529C8
+
+gUnknown_83529DC:: @ 83529DC
+	connection up, -12, 0x301
+	connection down, 0, 0x300
+
+gUnknown_83529F4:: @ 83529F4
+	.4byte 2
+	.4byte gUnknown_83529DC
+
+gUnknown_83529FC:: @ 83529FC
+	connection up, -12, 0x302
+	connection down, -12, 0x301
+
+gUnknown_8352A14:: @ 8352A14
+	.4byte 2
+	.4byte gUnknown_83529FC
+
+gUnknown_8352A1C:: @ 8352A1C
+	connection up, 60, 0x316
+	connection left, -10, 0x302
+
+gUnknown_8352A34:: @ 8352A34
+	.4byte 2
+	.4byte gUnknown_8352A1C
+
+gUnknown_8352A3C:: @ 8352A3C
+	connection down, -60, 0x315
+	connection right, -10, 0x303
+
+gUnknown_8352A54:: @ 8352A54
+	.4byte 2
+	.4byte gUnknown_8352A3C
+
+gUnknown_8352A5C:: @ 8352A5C
+	connection up, 0, 0x303
+	connection down, 0, 0x30B
+
+gUnknown_8352A74:: @ 8352A74
+	.4byte 2
+	.4byte gUnknown_8352A5C
+
+gUnknown_8352A7C:: @ 8352A7C
+	connection up, 0, 0x30B
+	connection down, -12, 0x305
+
+gUnknown_8352A94:: @ 8352A94
+	.4byte 2
+	.4byte gUnknown_8352A7C
+
+gUnknown_8352A9C:: @ 8352A9C
+	connection left, -10, 0x306
+	connection right, -10, 0x30B
+
+gUnknown_8352AB4:: @ 8352AB4
+	.4byte 2
+	.4byte gUnknown_8352A9C
+
+gUnknown_8352ABC:: @ 8352ABC
+	connection left, -10, 0x30B
+	connection right, 0, 0x304
+
+gUnknown_8352AD4:: @ 8352AD4
+	.4byte 2
+	.4byte gUnknown_8352ABC
+
+gUnknown_8352ADC:: @ 8352ADC
+	connection left, -10, 0x303
+	connection right, 0, 0x31C
+
+gUnknown_8352AF4:: @ 8352AF4
+	.4byte 2
+	.4byte gUnknown_8352ADC
+
+gUnknown_8352AFC:: @ 8352AFC
+	connection down, 0, 0x304
+	connection left, 0, 0x31B
+
+gUnknown_8352B14:: @ 8352B14
+	.4byte 2
+	.4byte gUnknown_8352AFC
+
+gUnknown_8352B1C:: @ 8352B1C
+	connection left, -10, 0x305
+	connection right, -60, 0x31E
+
+gUnknown_8352B34:: @ 8352B34
+	.4byte 2
+	.4byte gUnknown_8352B1C
+
+gUnknown_8352B3C:: @ 8352B3C
+	connection up, 0, 0x304
+	connection down, -48, 0x31F
+	connection left, 60, 0x31D
+
+gUnknown_8352B60:: @ 8352B60
+	.4byte 3
+	.4byte gUnknown_8352B3C
+
+gUnknown_8352B68:: @ 8352B68
+	connection up, 48, 0x31E
+	connection left, 0, 0x320
+
+gUnknown_8352B80:: @ 8352B80
+	.4byte 2
+	.4byte gUnknown_8352B68
+
+gUnknown_8352B88:: @ 8352B88
+	connection left, 40, 0x321
+	connection right, 0, 0x31F
+
+gUnknown_8352BA0:: @ 8352BA0
+	.4byte 2
+	.4byte gUnknown_8352B88
+
+gUnknown_8352BA8:: @ 8352BA8
+	connection left, -10, 0x307
+	connection right, -40, 0x320
+
+gUnknown_8352BC0:: @ 8352BC0
+	.4byte 2
+	.4byte gUnknown_8352BA8
+
+gUnknown_8352BC8:: @ 8352BC8
+	connection down, 0, 0x323
+	connection right, -10, 0x306
+
+gUnknown_8352BE0:: @ 8352BE0
+	.4byte 2
+	.4byte gUnknown_8352BC8
+
+gUnknown_8352BE8:: @ 8352BE8
+	connection up, 0, 0x322
+	connection down, 0, 0x324
+
+gUnknown_8352C00:: @ 8352C00
+	.4byte 2
+	.4byte gUnknown_8352BE8
+
+gUnknown_8352C08:: @ 8352C08
+	connection up, 0, 0x323
+	connection right, -10, 0x307
+
+gUnknown_8352C20:: @ 8352C20
+	.4byte 2
+	.4byte gUnknown_8352C08
+
+gUnknown_8352C28:: @ 8352C28
+	connection up, -12, 0x307
+	connection left, 40, 0x326
+
+gUnknown_8352C40:: @ 8352C40
+	.4byte 2
+	.4byte gUnknown_8352C28
+
+gUnknown_8352C48:: @ 8352C48
+	connection left, 0, 0x308
+	connection right, -40, 0x325
+
+gUnknown_8352C60:: @ 8352C60
+	.4byte 2
+	.4byte gUnknown_8352C48
+
+gUnknown_8352C68:: @ 8352C68
+	connection up, 0, 0x300
+	connection down, 0, 0x328
+
+gUnknown_8352C80:: @ 8352C80
+	.4byte 2
+	.4byte gUnknown_8352C68
+
+gUnknown_8352C88:: @ 8352C88
+	connection up, 0, 0x327
+	connection down, 0, 0x308
+
+gUnknown_8352CA0:: @ 8352CA0
+	.4byte 2
+	.4byte gUnknown_8352C88
+
+gUnknown_8352CA8:: @ 8352CA8
+	connection up, 0, 0x32A
+	connection right, -10, 0x301
+
+gUnknown_8352CC0:: @ 8352CC0
+	.4byte 2
+	.4byte gUnknown_8352CA8
+
+gUnknown_8352CC8:: @ 8352CC8
+	connection up, 0, 0x309
+	connection down, 0, 0x329
+
+gUnknown_8352CE0:: @ 8352CE0
+	.4byte 2
+	.4byte gUnknown_8352CC8
+
+gUnknown_8352CE8:: @ 8352CE8
+	connection down, -12, 0x303
+	connection right, 0, 0x32C
+
+gUnknown_8352D00:: @ 8352D00
+	.4byte 2
+	.4byte gUnknown_8352CE8
+
+gUnknown_8352D08:: @ 8352D08
+	connection left, 0, 0x32B
+
+gUnknown_8352D14:: @ 8352D14
+	.4byte 1
+	.4byte gUnknown_8352D08
+
+gUnknown_8352D1C:: @ 8352D1C
+	connection left, 120, 0x30C
+
+gUnknown_8352D28:: @ 8352D28
+	.4byte 1
+	.4byte gUnknown_8352D1C
+
+gUnknown_8352D30:: @ 8352D30
+	connection up, 0, 0x30C
+
+gUnknown_8352D3C:: @ 8352D3C
+	.4byte 1
+	.4byte gUnknown_8352D30
+
+gUnknown_8352D44:: @ 8352D44
+	connection down, -24, 0x30D
+
+gUnknown_8352D50:: @ 8352D50
+	.4byte 1
+	.4byte gUnknown_8352D44
+
+gUnknown_8352D58:: @ 8352D58
+	connection right, 0, 0x30E
+
+gUnknown_8352D64:: @ 8352D64
+	.4byte 1
+	.4byte gUnknown_8352D58
+
+gUnknown_8352D6C:: @ 8352D6C
+	connection up, 0, 0x30E
+
+gUnknown_8352D78:: @ 8352D78
+	.4byte 1
+	.4byte gUnknown_8352D6C
+
+gUnknown_8352D80:: @ 8352D80
+	connection up, 0, 0x30E
+
+gUnknown_8352D8C:: @ 8352D8C
+	.4byte 1
+	.4byte gUnknown_8352D80
+
+gUnknown_8352D94:: @ 8352D94
+	connection up, 0, 0x30E
+
+gUnknown_8352DA0:: @ 8352DA0
+	.4byte 1
+	.4byte gUnknown_8352D94
+
+gUnknown_8352DA8:: @ 8352DA8
+	connection down, -48, 0x337
+
+gUnknown_8352DB4:: @ 8352DB4
+	.4byte 1
+	.4byte gUnknown_8352DA8
+
+gUnknown_8352DBC:: @ 8352DBC
+	connection up, 48, 0x336
+	connection down, 48, 0x310
+
+gUnknown_8352DD4:: @ 8352DD4
+	.4byte 2
+	.4byte gUnknown_8352DBC
+
+gUnknown_8352DDC:: @ 8352DDC
+	connection left, 0, 0x310
+	connection right, 20, 0x339
+
+gUnknown_8352DF4:: @ 8352DF4
+	.4byte 2
+	.4byte gUnknown_8352DDC
+
+gUnknown_8352DFC:: @ 8352DFC
+	connection left, -20, 0x338
+
+gUnknown_8352E08:: @ 8352E08
+	.4byte 1
+	.4byte gUnknown_8352DFC
+
+gUnknown_8352E10:: @ 8352E10
+	connection down, 0, 0x33B
+
+gUnknown_8352E1C:: @ 8352E1C
+	.4byte 1
+	.4byte gUnknown_8352E10
+
+gUnknown_8352E24:: @ 8352E24
+	connection up, 0, 0x33A
+	connection right, 0, 0x33C
+
+gUnknown_8352E3C:: @ 8352E3C
+	.4byte 2
+	.4byte gUnknown_8352E24
+
+gUnknown_8352E44:: @ 8352E44
+	connection left, 0, 0x33B
+	connection left, 40, 0x312
+	connection left, 80, 0x33D
+
+gUnknown_8352E68:: @ 8352E68
+	.4byte 3
+	.4byte gUnknown_8352E44
+
+gUnknown_8352E70:: @ 8352E70
+	connection right, -80, 0x33C
+
+gUnknown_8352E7C:: @ 8352E7C
+	.4byte 1
+	.4byte gUnknown_8352E70
+
+gUnknown_8352E84:: @ 8352E84
+	connection down, 48, 0x311
+
+gUnknown_8352E90:: @ 8352E90
+	.4byte 1
+	.4byte gUnknown_8352E84
+
+gUnknown_8352E98:: @ 8352E98
+	connection up, 0, 0x311
+	connection right, 20, 0x340
+
+gUnknown_8352EB0:: @ 8352EB0
+	.4byte 2
+	.4byte gUnknown_8352E98
+
+gUnknown_8352EB8:: @ 8352EB8
+	connection down, -48, 0x341
+	connection left, -20, 0x33F
+
+gUnknown_8352ED0:: @ 8352ED0
+	.4byte 2
+	.4byte gUnknown_8352EB8
+
+gUnknown_8352ED8:: @ 8352ED8
+	connection up, 48, 0x340
+
+gUnknown_8352EE4:: @ 8352EE4
+	.4byte 1
+	.4byte gUnknown_8352ED8
diff --git a/data/data.s b/data/data.s
index dd692cb33..6c3f3f954 100644
--- a/data/data.s
+++ b/data/data.s
@@ -909,7 +909,15 @@ gUnknown_826D2B0:: @ 826D2B0
 	.incbin "baserom.gba", 0x26D2B0, 0x28
 
 gDirectionToVectors:: @ 826D2D8
-	.incbin "baserom.gba", 0x26D2D8, 0x48
+	.4byte  0,  0
+	.4byte  0,  1
+	.4byte  0, -1
+	.4byte -1,  0
+	.4byte  1,  0
+	.4byte -1,  1
+	.4byte  1,  1
+	.4byte -1, -1
+	.4byte  1, -1
 
 gUnknown_826D320:: @ 826D320
 	.incbin "baserom.gba", 0x26D320, 0x10
diff --git a/data/fieldmap.s b/data/fieldmap.s
deleted file mode 100644
index 3b24a4f86..000000000
--- a/data/fieldmap.s
+++ /dev/null
@@ -1,6 +0,0 @@
-    .include "asm/macros.inc"
-
-    .section .rodata
-
-gUnknown_8352754:: @ 8352754
-	.incbin "baserom.gba", 0x352754, 0x798
diff --git a/ld_script.txt b/ld_script.txt
index 7d2adefe7..6eb5e4e6d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -367,7 +367,7 @@ SECTIONS {
         src/bg_regs.o(.rodata);
         src/string_util.o(.rodata);
         data/data.o(.rodata);
-        data/fieldmap.o(.rodata);
+        data/connections.o(.rodata);
         src/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);
         data/metatile_behavior.o(.rodata);