Split out trainer tower data

3 files changed, 621 insertions, 394 deletions

diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index cf93ad054..e20dc9baf 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -270,399 +270,9 @@ gUnknown_8479D24:: @ 8479D24
 
 	// trainer_tower
 
-	.align 2
-gUnknown_8479D34::
-	.byte 0x03, 0x26
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x27
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x1f
-	.align 2
-	.byte 0x4c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x22
-	.align 2
-	.byte 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x41
-	.align 2
-	.byte 0x40, 0x41, 0x42, 0x43, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x02
-	.align 2
-	.byte 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0xff, 0xff
-	.byte 0x54, 0x55, 0x56, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x01, 0x6d
-	.align 2
-	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0x66
-	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0xff
-	.byte 0x5a, 0x5c, 0x60, 0x61, 0x62, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x2e
-	.align 2
-	.byte 0x6b, 0x6c, 0x6d, 0x6e, 0xff, 0xff, 0xff, 0xff
-	.byte 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xff, 0xff
-	.byte 0x6b, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x30
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa6, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x0f
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x39
-	.align 2
-	.byte 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x36
-	.align 2
-	.byte 0xae, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xaf, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3a
-	.align 2
-	.byte 0xb2, 0xb3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3b
-	.align 2
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-	.align 2
-	.byte 0x03, 0x3e
-	.align 2
-	.byte 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xba, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-
-gUnknown_8479ED8:: @ 8479ED8
-    .align 2
-	.byte 0x1c, 0x03, 0x01
-	.align 2
-	.byte 0x38, 0x04, 0x00
-	.align 2
-	.byte 0x25, 0x06, 0x01
-	.align 2
-	.byte 0x26, 0x07, 0x00
-	.align 2
-	.byte 0x29, 0x08, 0x00
-	.align 2
-	.byte 0x2a, 0x09, 0x01
-	.align 2
-	.byte 0x34, 0x0a, 0x00
-	.align 2
-	.byte 0x1c, 0x0b, 0x01
-	.align 2
-	.byte 0x1d, 0x0c, 0x01
-	.align 2
-	.byte 0x13, 0x0d, 0x00
-	.align 2
-	.byte 0x34, 0x0e, 0x00
-	.align 2
-	.byte 0x2d, 0x0f, 0x00
-	.align 2
-	.byte 0x36, 0x10, 0x00
-	.align 2
-	.byte 0x1a, 0x11, 0x00
-	.align 2
-	.byte 0x1a, 0x12, 0x00
-	.align 2
-	.byte 0x27, 0x13, 0x00
-	.align 2
-	.byte 0x34, 0x14, 0x00
-	.align 2
-	.byte 0x13, 0x15, 0x00
-	.align 2
-	.byte 0x17, 0x16, 0x01
-	.align 2
-	.byte 0x3d, 0x17, 0x00
-	.align 2
-	.byte 0x13, 0x1d, 0x00
-	.align 2
-	.byte 0x17, 0x1e, 0x01
-	.align 2
-	.byte 0x1e, 0x20, 0x00
-	.align 2
-	.byte 0x1f, 0x21, 0x01
-	.align 2
-	.byte 0x20, 0x22, 0x00
-	.align 2
-	.byte 0x23, 0x23, 0x01
-	.align 2
-	.byte 0x12, 0x24, 0x00
-	.align 2
-	.byte 0x39, 0x26, 0x00
-	.align 2
-	.byte 0x29, 0x2d, 0x00
-	.align 2
-	.byte 0x1a, 0x2e, 0x00
-	.align 2
-	.byte 0x10, 0x2f, 0x00
-	.align 2
-	.byte 0x18, 0x30, 0x01
-	.align 2
-	.byte 0x1d, 0x31, 0x01
-	.align 2
-	.byte 0x2e, 0x32, 0x01
-	.align 2
-	.byte 0x28, 0x33, 0x01
-	.align 2
-	.byte 0x3e, 0x35, 0x00
-	.align 2
-	.byte 0x1b, 0x38, 0x00
-	.align 2
-	.byte 0x19, 0x40, 0x00
-	.align 2
-	.byte 0x1c, 0x41, 0x01
-	.align 2
-	.byte 0x27, 0x42, 0x00
-	.align 2
-	.byte 0x28, 0x43, 0x01
-	.align 2
-	.byte 0x16, 0x47, 0x01
-	.align 2
-	.byte 0x14, 0x48, 0x00
-	.align 2
-	.byte 0x38, 0x49, 0x00
-	.align 2
-	.byte 0x12, 0x58, 0x00
-	.align 2
-	.byte 0x14, 0x59, 0x00
-	.align 2
-	.byte 0x16, 0x5a, 0x01
-	.align 2
-	.byte 0x3e, 0x5b, 0x00
-	.align 2
-	.byte 0x27, 0x5c, 0x00
-	.align 2
-	.byte 0x28, 0x5d, 0x01
-	.align 2
-	.byte 0x34, 0x5e, 0x00
-	.align 2
-	.byte 0x34, 0x5f, 0x00
-	.align 2
-	.byte 0x38, 0x60, 0x00
-	.align 2
-	.byte 0x35, 0x61, 0x00
-	.align 2
-	.byte 0x34, 0x62, 0x00
-	.align 2
-	.byte 0x1e, 0x63, 0x00
-	.align 2
-	.byte 0x39, 0x64, 0x00
-	.align 2
-	.byte 0x2d, 0x65, 0x00
-	.align 2
-	.byte 0x35, 0x66, 0x00
-	.align 2
-	.byte 0x20, 0x67, 0x00
-	.align 2
-	.byte 0x1d, 0x68, 0x01
-	.align 2
-	.byte 0x2e, 0x69, 0x01
-	.align 2
-	.byte 0x13, 0x6a, 0x00
-	.align 2
-	.byte 0x1a, 0x6b, 0x00
-	.align 2
-	.byte 0x1a, 0x6c, 0x00
-	.align 2
-	.byte 0x19, 0x6d, 0x00
-	.align 2
-	.byte 0x1a, 0x6e, 0x00
-	.align 2
-	.byte 0x36, 0x6f, 0x00
-	.align 2
-	.byte 0x37, 0x71, 0x00
-	.align 2
-	.byte 0x29, 0x74, 0x00
-	.align 2
-	.byte 0x2a, 0x75, 0x01
-	.align 2
-	.byte 0x3d, 0x7a, 0x00
-	.align 2
-	.byte 0x3a, 0x7d, 0x01
-	.align 2
-	.byte 0x17, 0x89, 0x01
-	.align 2
-	.byte 0x18, 0x8a, 0x01
-	.align 2
-	.byte 0x25, 0x8b, 0x01
-	.align 2
-	.byte 0x1c, 0x8c, 0x01
-	.align 2
-	.byte 0x27, 0x8d, 0x00
-	.align 2
-	.byte 0x28, 0x8e, 0x01
-	.align 2
-	.byte 0x1c, 0x8f, 0x01
-	.align 2
-	.byte 0x38, 0x90, 0x00
-	.align 2
-	.byte 0x1c, 0x91, 0x01
-	.align 2
-	.byte 0x16, 0x92, 0x01
-	.align 2
+	.section .rodata.after_trainer_tower
 
-gUnknown_847A024:: @ 847A024
-	.byte 0x1d, 0x17, 0x1f, 0x01, 0x01
-	.align 2
-	.byte 0x11, 0x11, 0x34, 0x01, 0x01
-	.align 2
-	.byte 0x1d, 0x19, 0x4a, 0x01, 0x00
-	.align 2
-	.byte 0x20, 0x23, 0x4b, 0x00, 0x01
-	.align 2
-	.byte 0x26, 0x2e, 0x4c, 0x00, 0x01
-	.align 2
-	.byte 0x11, 0x11, 0x7e, 0x01, 0x01
-	.align 2
-	.byte 0x29, 0x2a, 0x7f, 0x00, 0x01
-	.align 2
-	.byte 0x1d, 0x19, 0x80, 0x01, 0x00
-	.align 2
-	.byte 0x18, 0x36, 0x81, 0x01, 0x00
-	.align 2
-	.byte 0x2e, 0x26, 0x82, 0x01, 0x00
-
-	.align 2
-gUnknown_847A074:: @ 847A074
-	.incbin "baserom.gba", 0x47A074, 0x1A4
-
-gUnknown_847A218:: @ 847A218
-	.incbin "baserom.gba", 0x47A218, 0x14
-
-gUnknown_847A22C:: @ 847A22C
-	.incbin "baserom.gba", 0x47A22C, 0x4
-
-	.align 2
-gUnknown_847A230:: @ 847A230
-	.4byte sub_815DD44
-	.4byte sub_815DF54
-	.4byte sub_815E160
-	.4byte sub_815E1C0
-	.4byte sub_815E1F0
-	.4byte sub_815E218
-	.4byte sub_815E28C
-	.4byte sub_815E394
-	.4byte sub_815E408
-	.4byte sub_815E4B0
-	.4byte sub_815E56C
-	.4byte sub_815E5C4
-	.4byte sub_815E5F0
-	.4byte sub_815E658
-	.4byte sub_815E720
-	.4byte sub_815E88C
-	.4byte sub_815E8B4
-	.4byte sub_815E8CC
-	.4byte sub_815E908
-	.4byte sub_815E948
-	.4byte sub_815E9C8
-
-gUnknown_847A284:: @ 847A284
-	.2byte 0x012a, 0x016e, 0x0176
-	.2byte 0x012b, 0x016f, 0x0177
-	.2byte 0x012c, 0x0170, 0x0178
-	.2byte 0x012d, 0x0171, 0x0179
-	.2byte 0x012e, 0x0172, 0x017a
-	.2byte 0x012f, 0x0173, 0x017b
-	.2byte 0x0130, 0x0174, 0x017c
-	.2byte 0x0131, 0x0175, 0x017d
-
-gUnknown_847A2B4:: @ 847A2B4
-	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
-
-gUnknown_847A2D2:: @ 847A2D2
-	.2byte 0x011d
-	.2byte 0x011c
-	.2byte 0x011c
-	.2byte 0x011b
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011b
-	.2byte 0x011b
-	.2byte 0x011d
-	.2byte 0x011c
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011d
-	.2byte 0x011d
-
-gUnknown_847A2EE:: @ 847A2EE
-	.byte 0x00, 0x02
-	.byte 0x01, 0x03
-	.byte 0x02, 0x04
-	.byte 0x03, 0x05
-	.byte 0x04, 0x01
-	.byte 0x05, 0x02
-	.byte 0x00, 0x03
-	.byte 0x01, 0x04
-
-gUnknown_847A2FE:: @ 847A2FE
-	.byte 0x00, 0x01
-	.byte 0x01, 0x03
-	.byte 0x02, 0x00
-	.byte 0x03, 0x04
-	.byte 0x04, 0x02
-	.byte 0x05, 0x02
-	.byte 0x00, 0x03
-	.byte 0x01, 0x05
-
-gUnknown_847A30E:: @ 847A30E
-	.byte 0x00, 0x02
-	.byte 0x04, 0x01
-	.byte 0x03, 0x05
-	.byte 0x02, 0x03
-	.byte 0x01, 0x03
-	.byte 0x04, 0x00
-	.byte 0x04, 0x01
-	.byte 0x02, 0x05
-	.byte 0x00, 0x03
-	.byte 0x00, 0x05
-	.byte 0x02, 0x01
-	.byte 0x04, 0x05
-	.byte 0x00, 0x00
+	// unk_815F138
 
 gUnknown_847A328::
 	.incbin "data/graphics/unk_847a348.gbapal"
@@ -670,8 +280,6 @@ gUnknown_847A328::
 gUnknown_847A348::
 	.incbin "data/graphics/unk_847a348.4bpp.lz"
 
-	// unk_815F138
-
 gUnknown_847A79C:: @ 847A79C
 	obj_tiles gUnknown_847A348, 0xE00, 0
 
diff --git a/data/trainer_tower.s b/data/trainer_tower.s
new file mode 100644
index 000000000..f90d1dd2b
--- /dev/null
+++ b/data/trainer_tower.s
@@ -0,0 +1,616 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gUnknown_8479D34::
+	.byte 0x03, 0x26
+	.align 2
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x27
+	.align 2
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0x9a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x01, 0x1f
+	.align 2
+	.byte 0x4c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x01, 0x22
+	.align 2
+	.byte 0x53, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x41
+	.align 2
+	.byte 0x40, 0x41, 0x42, 0x43, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x01, 0x02
+	.align 2
+	.byte 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0xff, 0xff
+	.byte 0x54, 0x55, 0x56, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x01, 0x6d
+	.align 2
+	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0x66
+	.byte 0x5b, 0x5d, 0x5e, 0x5f, 0x63, 0x64, 0x65, 0xff
+	.byte 0x5a, 0x5c, 0x60, 0x61, 0x62, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x2e
+	.align 2
+	.byte 0x6b, 0x6c, 0x6d, 0x6e, 0xff, 0xff, 0xff, 0xff
+	.byte 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0xff, 0xff
+	.byte 0x6b, 0x6c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x30
+	.align 2
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xa6, 0xa7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x0f
+	.align 2
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xa8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xa9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x39
+	.align 2
+	.byte 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x36
+	.align 2
+	.byte 0xae, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xaf, 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x3a
+	.align 2
+	.byte 0xb2, 0xb3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x3b
+	.align 2
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xb4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+	.align 2
+	.byte 0x03, 0x3e
+	.align 2
+	.byte 0xb9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xba, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+
+gUnknown_8479ED8:: @ 8479ED8
+    .align 2
+	.byte 0x1c, 0x03, 0x01
+	.align 2
+	.byte 0x38, 0x04, 0x00
+	.align 2
+	.byte 0x25, 0x06, 0x01
+	.align 2
+	.byte 0x26, 0x07, 0x00
+	.align 2
+	.byte 0x29, 0x08, 0x00
+	.align 2
+	.byte 0x2a, 0x09, 0x01
+	.align 2
+	.byte 0x34, 0x0a, 0x00
+	.align 2
+	.byte 0x1c, 0x0b, 0x01
+	.align 2
+	.byte 0x1d, 0x0c, 0x01
+	.align 2
+	.byte 0x13, 0x0d, 0x00
+	.align 2
+	.byte 0x34, 0x0e, 0x00
+	.align 2
+	.byte 0x2d, 0x0f, 0x00
+	.align 2
+	.byte 0x36, 0x10, 0x00
+	.align 2
+	.byte 0x1a, 0x11, 0x00
+	.align 2
+	.byte 0x1a, 0x12, 0x00
+	.align 2
+	.byte 0x27, 0x13, 0x00
+	.align 2
+	.byte 0x34, 0x14, 0x00
+	.align 2
+	.byte 0x13, 0x15, 0x00
+	.align 2
+	.byte 0x17, 0x16, 0x01
+	.align 2
+	.byte 0x3d, 0x17, 0x00
+	.align 2
+	.byte 0x13, 0x1d, 0x00
+	.align 2
+	.byte 0x17, 0x1e, 0x01
+	.align 2
+	.byte 0x1e, 0x20, 0x00
+	.align 2
+	.byte 0x1f, 0x21, 0x01
+	.align 2
+	.byte 0x20, 0x22, 0x00
+	.align 2
+	.byte 0x23, 0x23, 0x01
+	.align 2
+	.byte 0x12, 0x24, 0x00
+	.align 2
+	.byte 0x39, 0x26, 0x00
+	.align 2
+	.byte 0x29, 0x2d, 0x00
+	.align 2
+	.byte 0x1a, 0x2e, 0x00
+	.align 2
+	.byte 0x10, 0x2f, 0x00
+	.align 2
+	.byte 0x18, 0x30, 0x01
+	.align 2
+	.byte 0x1d, 0x31, 0x01
+	.align 2
+	.byte 0x2e, 0x32, 0x01
+	.align 2
+	.byte 0x28, 0x33, 0x01
+	.align 2
+	.byte 0x3e, 0x35, 0x00
+	.align 2
+	.byte 0x1b, 0x38, 0x00
+	.align 2
+	.byte 0x19, 0x40, 0x00
+	.align 2
+	.byte 0x1c, 0x41, 0x01
+	.align 2
+	.byte 0x27, 0x42, 0x00
+	.align 2
+	.byte 0x28, 0x43, 0x01
+	.align 2
+	.byte 0x16, 0x47, 0x01
+	.align 2
+	.byte 0x14, 0x48, 0x00
+	.align 2
+	.byte 0x38, 0x49, 0x00
+	.align 2
+	.byte 0x12, 0x58, 0x00
+	.align 2
+	.byte 0x14, 0x59, 0x00
+	.align 2
+	.byte 0x16, 0x5a, 0x01
+	.align 2
+	.byte 0x3e, 0x5b, 0x00
+	.align 2
+	.byte 0x27, 0x5c, 0x00
+	.align 2
+	.byte 0x28, 0x5d, 0x01
+	.align 2
+	.byte 0x34, 0x5e, 0x00
+	.align 2
+	.byte 0x34, 0x5f, 0x00
+	.align 2
+	.byte 0x38, 0x60, 0x00
+	.align 2
+	.byte 0x35, 0x61, 0x00
+	.align 2
+	.byte 0x34, 0x62, 0x00
+	.align 2
+	.byte 0x1e, 0x63, 0x00
+	.align 2
+	.byte 0x39, 0x64, 0x00
+	.align 2
+	.byte 0x2d, 0x65, 0x00
+	.align 2
+	.byte 0x35, 0x66, 0x00
+	.align 2
+	.byte 0x20, 0x67, 0x00
+	.align 2
+	.byte 0x1d, 0x68, 0x01
+	.align 2
+	.byte 0x2e, 0x69, 0x01
+	.align 2
+	.byte 0x13, 0x6a, 0x00
+	.align 2
+	.byte 0x1a, 0x6b, 0x00
+	.align 2
+	.byte 0x1a, 0x6c, 0x00
+	.align 2
+	.byte 0x19, 0x6d, 0x00
+	.align 2
+	.byte 0x1a, 0x6e, 0x00
+	.align 2
+	.byte 0x36, 0x6f, 0x00
+	.align 2
+	.byte 0x37, 0x71, 0x00
+	.align 2
+	.byte 0x29, 0x74, 0x00
+	.align 2
+	.byte 0x2a, 0x75, 0x01
+	.align 2
+	.byte 0x3d, 0x7a, 0x00
+	.align 2
+	.byte 0x3a, 0x7d, 0x01
+	.align 2
+	.byte 0x17, 0x89, 0x01
+	.align 2
+	.byte 0x18, 0x8a, 0x01
+	.align 2
+	.byte 0x25, 0x8b, 0x01
+	.align 2
+	.byte 0x1c, 0x8c, 0x01
+	.align 2
+	.byte 0x27, 0x8d, 0x00
+	.align 2
+	.byte 0x28, 0x8e, 0x01
+	.align 2
+	.byte 0x1c, 0x8f, 0x01
+	.align 2
+	.byte 0x38, 0x90, 0x00
+	.align 2
+	.byte 0x1c, 0x91, 0x01
+	.align 2
+	.byte 0x16, 0x92, 0x01
+	.align 2
+
+gUnknown_847A024:: @ 847A024
+	.byte 0x1d, 0x17, 0x1f, 0x01, 0x01
+	.align 2
+	.byte 0x11, 0x11, 0x34, 0x01, 0x01
+	.align 2
+	.byte 0x1d, 0x19, 0x4a, 0x01, 0x00
+	.align 2
+	.byte 0x20, 0x23, 0x4b, 0x00, 0x01
+	.align 2
+	.byte 0x26, 0x2e, 0x4c, 0x00, 0x01
+	.align 2
+	.byte 0x11, 0x11, 0x7e, 0x01, 0x01
+	.align 2
+	.byte 0x29, 0x2a, 0x7f, 0x00, 0x01
+	.align 2
+	.byte 0x1d, 0x19, 0x80, 0x01, 0x00
+	.align 2
+	.byte 0x18, 0x36, 0x81, 0x01, 0x00
+	.align 2
+	.byte 0x2e, 0x26, 0x82, 0x01, 0x00
+
+	.align 2
+gUnknown_847A074:: @ 847A074
+	.byte 0x03, 0x06
+	.align 2
+	.byte 0x37, 0x06
+	.align 2
+	.byte 0x02, 0x06
+	.align 2
+	.byte 0x67, 0x01
+	.align 2
+	.byte 0x04, 0x01
+	.align 2
+	.byte 0x24, 0x04
+	.align 2
+	.byte 0x4a, 0x01
+	.align 2
+	.byte 0x26, 0x01
+	.align 2
+	.byte 0x2a, 0x00
+	.align 2
+	.byte 0x42, 0x03
+	.align 2
+	.byte 0x1b, 0x09
+	.align 2
+	.byte 0x4c, 0x03
+	.align 2
+	.byte 0x44, 0x03
+	.align 2
+	.byte 0x21, 0x04
+	.align 2
+	.byte 0x43, 0x03
+	.align 2
+	.byte 0x6a, 0x01
+	.align 2
+	.byte 0x5d, 0x05
+	.align 2
+	.byte 0x56, 0x05
+	.align 2
+	.byte 0x09, 0x05
+	.align 2
+	.byte 0x11, 0x04
+	.align 2
+	.byte 0x48, 0x03
+	.align 2
+	.byte 0x3c, 0x00
+	.align 2
+	.byte 0x29, 0x00
+	.align 2
+	.byte 0x5c, 0x09
+	.align 2
+	.byte 0x28, 0x09
+	.align 2
+	.byte 0x06, 0x0c
+	.align 2
+	.byte 0x68, 0x0b
+	.align 2
+	.byte 0x05, 0x0b
+	.align 2
+	.byte 0x58, 0x0d
+	.align 2
+	.byte 0x16, 0x0d
+	.align 2
+	.byte 0x46, 0x08
+	.align 2
+	.byte 0x0f, 0x01
+	.align 2
+	.byte 0x3f, 0x03
+	.align 2
+	.byte 0x0e, 0x03
+	.align 2
+	.byte 0x5f, 0x04
+	.align 2
+	.byte 0x63, 0x04
+	.align 2
+	.byte 0x50, 0x04
+	.align 2
+	.byte 0x10, 0x04
+	.align 2
+	.byte 0x52, 0x03
+	.align 2
+	.byte 0x35, 0x04
+	.align 2
+	.byte 0x5b, 0x03
+	.align 2
+	.byte 0x14, 0x03
+	.align 2
+	.byte 0x3d, 0x00
+	.align 2
+	.byte 0x13, 0x00
+	.align 2
+	.byte 0x12, 0x0b
+	.align 2
+	.byte 0x30, 0x07
+	.align 2
+	.byte 0x38, 0x07
+	.align 2
+	.byte 0x2f, 0x07
+	.align 2
+	.byte 0x3b, 0x01
+	.align 2
+	.byte 0x31, 0x01
+	.align 2
+	.byte 0x4e, 0x0b
+	.align 2
+	.byte 0x3a, 0x00
+	.align 2
+	.byte 0x32, 0x00
+	.align 2
+	.byte 0x23, 0x03
+	.align 2
+	.byte 0x0d, 0x0d
+	.align 2
+	.byte 0x0a, 0x03
+	.align 2
+	.byte 0x49, 0x01
+	.align 2
+	.byte 0x0c, 0x01
+	.align 2
+	.byte 0x69, 0x01
+	.align 2
+	.byte 0x0b, 0x01
+	.align 2
+	.byte 0x25, 0x01
+	.align 2
+	.byte 0x3e, 0x02
+	.align 2
+	.byte 0x27, 0x02
+	.align 2
+	.byte 0x65, 0x01
+	.align 2
+	.byte 0x2d, 0x01
+	.align 2
+	.byte 0x61, 0x01
+	.align 2
+	.byte 0x2b, 0x03
+	.align 2
+	.byte 0x66, 0x05
+	.align 2
+	.byte 0x2e, 0x05
+	.align 2
+	.byte 0x2c, 0x00
+	.align 2
+	.byte 0x5e, 0x02
+	.align 2
+	.byte 0x34, 0x02
+	.align 2
+	.byte 0x51, 0x00
+	.align 2
+	.byte 0x59, 0x00
+	.align 2
+	.byte 0x40, 0x03
+	.align 2
+	.byte 0x55, 0x06
+	.align 2
+	.byte 0x53, 0x06
+	.align 2
+	.byte 0x4b, 0x04
+	.align 2
+	.byte 0x15, 0x04
+	.align 2
+	.byte 0x1a, 0x09
+	.align 2
+	.byte 0x57, 0x0a
+	.align 2
+	.byte 0x17, 0x01
+	.align 2
+	.byte 0x47, 0x03
+	.align 2
+	.byte 0x62, 0x01
+	.align 2
+	.byte 0x39, 0x00
+	.align 2
+	.byte 0x1d, 0x00
+	.align 2
+	.byte 0x1c, 0x04
+	.align 2
+	.byte 0x20, 0x00
+	.align 2
+	.byte 0x4f, 0x05
+	.align 2
+	.byte 0x22, 0x05
+	.align 2
+	.byte 0x45, 0x0b
+	.align 2
+	.byte 0x1f, 0x0b
+	.align 2
+	.byte 0x5a, 0x00
+	.align 2
+	.byte 0x1e, 0x00
+	.align 2
+	.byte 0x08, 0x00
+	.align 2
+	.byte 0x64, 0x02
+	.align 2
+	.byte 0x07, 0x02
+	.align 2
+	.byte 0x60, 0x08
+	.align 2
+	.byte 0x36, 0x08
+	.align 2
+	.byte 0x41, 0x0b
+	.align 2
+	.byte 0x33, 0x0b
+	.align 2
+	.byte 0x54, 0x00
+	.align 2
+	.byte 0x18, 0x01
+	.align 2
+	.byte 0x4d, 0x0b
+	.align 2
+	.byte 0x19, 0x00
+
+	.align 2
+gUnknown_847A218:: @ 847A218
+	@ window template
+	.byte 0x00, 0x03, 0x01, 0x1b, 0x12, 0x0f
+	.2byte 0x0001
+
+gUnknown_847A220:: @ 847A220
+	.byte 0xFF, 0, 0, 0, 0, 0
+	.2byte 0
+
+gUnknown_847A228::
+	.4byte 0x70
+
+gUnknown_847A22C:: @ 847A22C
+	.byte 0x00, 0x02, 0x03
+
+	.align 2
+gUnknown_847A230:: @ 847A230
+	.4byte sub_815DD44
+	.4byte sub_815DF54
+	.4byte sub_815E160
+	.4byte sub_815E1C0
+	.4byte sub_815E1F0
+	.4byte sub_815E218
+	.4byte sub_815E28C
+	.4byte sub_815E394
+	.4byte sub_815E408
+	.4byte sub_815E4B0
+	.4byte sub_815E56C
+	.4byte sub_815E5C4
+	.4byte sub_815E5F0
+	.4byte sub_815E658
+	.4byte sub_815E720
+	.4byte sub_815E88C
+	.4byte sub_815E8B4
+	.4byte sub_815E8CC
+	.4byte sub_815E908
+	.4byte sub_815E948
+	.4byte sub_815E9C8
+
+gUnknown_847A284:: @ 847A284
+	.2byte 0x012a, 0x016e, 0x0176
+	.2byte 0x012b, 0x016f, 0x0177
+	.2byte 0x012c, 0x0170, 0x0178
+	.2byte 0x012d, 0x0171, 0x0179
+	.2byte 0x012e, 0x0172, 0x017a
+	.2byte 0x012f, 0x0173, 0x017b
+	.2byte 0x0130, 0x0174, 0x017c
+	.2byte 0x0131, 0x0175, 0x017d
+
+gUnknown_847A2B4:: @ 847A2B4
+	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
+
+gUnknown_847A2D2:: @ 847A2D2
+	.2byte 0x011d
+	.2byte 0x011c
+	.2byte 0x011c
+	.2byte 0x011b
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011b
+	.2byte 0x011b
+	.2byte 0x011d
+	.2byte 0x011c
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011d
+
+gUnknown_847A2EE:: @ 847A2EE
+	.byte 0x00, 0x02
+	.byte 0x01, 0x03
+	.byte 0x02, 0x04
+	.byte 0x03, 0x05
+	.byte 0x04, 0x01
+	.byte 0x05, 0x02
+	.byte 0x00, 0x03
+	.byte 0x01, 0x04
+
+gUnknown_847A2FE:: @ 847A2FE
+	.byte 0x00, 0x01
+	.byte 0x01, 0x03
+	.byte 0x02, 0x00
+	.byte 0x03, 0x04
+	.byte 0x04, 0x02
+	.byte 0x05, 0x02
+	.byte 0x00, 0x03
+	.byte 0x01, 0x05
+
+gUnknown_847A30E:: @ 847A30E
+	.byte 0x00, 0x02
+	.byte 0x04, 0x01
+	.byte 0x03, 0x05
+	.byte 0x02, 0x03
+	.byte 0x01, 0x03
+	.byte 0x04, 0x00
+	.byte 0x04, 0x01
+	.byte 0x02, 0x05
+	.byte 0x00, 0x03
+	.byte 0x00, 0x05
+	.byte 0x02, 0x01
+	.byte 0x04, 0x05
+	.byte 0x00, 0x00
diff --git a/ld_script.txt b/ld_script.txt
index f2f835c83..8d188156b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -390,6 +390,9 @@ SECTIONS {
         data/data_8468C98.o(.rodata);
         src/quest_log_8150454.o(.rodata);
         data/data_8471F00.o(.rodata);
+        src/trainer_tower.o(.rodata);
+        data/trainer_tower.o(.rodata);
+        data/data_8471F00.o(.rodata.after_trainer_tower);
         src/mystery_event_msg.o(.rodata);
         data/mystery_event_msg.o(.rodata);
         src/m4a_tables.o(.rodata);