Split data/data_emerald.s

13 files changed, 1008 insertions, 959 deletions

diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
new file mode 100644
index 000000000..5d82c25f2
--- /dev/null
+++ b/data/battle_frontier_1.s
@@ -0,0 +1,206 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2, 0
+gUnknown_0860B358:: @ 860B358
+	.incbin "baserom.gba", 0x60b358, 0x1630
+
+gUnknown_0860C988:: @ 860C988
+	.incbin "baserom.gba", 0x60c988, 0x269
+
+gUnknown_0860CBF1:: @ 860CBF1
+	.incbin "baserom.gba", 0x60cbf1, 0x283
+
+gUnknown_0860CE74:: @ 860CE74
+	.incbin "baserom.gba", 0x60ce74, 0x10
+
+gUnknown_0860CE84:: @ 860CE84
+	.incbin "baserom.gba", 0x60ce84, 0x10
+
+gUnknown_0860CE94:: @ 860CE94
+	.incbin "baserom.gba", 0x60ce94, 0x20
+
+gUnknown_0860CEB4:: @ 860CEB4
+	.incbin "baserom.gba", 0x60ceb4, 0x90
+
+gUnknown_0860CF44:: @ 860CF44
+	.incbin "baserom.gba", 0x60cf44, 0xc
+
+gUnknown_0860CF50:: @ 860CF50
+	.incbin "baserom.gba", 0x60cf50, 0x58
+
+gUnknown_0860CFA8:: @ 860CFA8
+	.incbin "baserom.gba", 0x60cfa8, 0x30
+
+gUnknown_0860CFD8:: @ 860CFD8
+	.incbin "baserom.gba", 0x60cfd8, 0x30
+
+gUnknown_0860D008:: @ 860D008
+	.incbin "baserom.gba", 0x60d008, 0x48
+
+gUnknown_0860D050:: @ 860D050
+	.incbin "baserom.gba", 0x60d050, 0x18
+
+gUnknown_0860D068:: @ 860D068
+	.incbin "baserom.gba", 0x60d068, 0x18
+
+gUnknown_0860D080:: @ 860D080
+	.incbin "baserom.gba", 0x60d080, 0x10
+
+gUnknown_0860D090:: @ 860D090
+	.incbin "baserom.gba", 0x60d090, 0x5c
+
+gUnknown_0860D0EC:: @ 860D0EC
+	.incbin "baserom.gba", 0x60d0ec, 0x10
+
+gUnknown_0860D0FC:: @ 860D0FC
+	.incbin "baserom.gba", 0x60d0fc, 0x10
+
+gUnknown_0860D10C:: @ 860D10C
+	.incbin "baserom.gba", 0x60d10c, 0x40
+
+gUnknown_0860D14C:: @ 860D14C
+	.incbin "baserom.gba", 0x60d14c, 0x10
+
+gUnknown_0860D15C:: @ 860D15C
+	.incbin "baserom.gba", 0x60d15c, 0x40
+
+gUnknown_0860D19C:: @ 860D19C
+	.incbin "baserom.gba", 0x60d19c, 0x4
+
+gUnknown_0860D1A0:: @ 860D1A0
+	.incbin "baserom.gba", 0x60d1a0, 0x20
+
+gUnknown_0860D1C0:: @ 860D1C0
+	.incbin "baserom.gba", 0x60d1c0, 0x10
+
+gUnknown_0860D1D0:: @ 860D1D0
+	.incbin "baserom.gba", 0x60d1d0, 0x44
+
+gUnknown_0860D214:: @ 860D214
+	.incbin "baserom.gba", 0x60d214, 0x80
+
+gUnknown_0860D294:: @ 860D294
+	.incbin "baserom.gba", 0x60d294, 0xac
+
+gUnknown_0860D340:: @ 860D340
+	.incbin "baserom.gba", 0x60d340, 0x3
+
+gUnknown_0860D343:: @ 860D343
+	.incbin "baserom.gba", 0x60d343, 0x3
+
+gUnknown_0860D346:: @ 860D346
+	.incbin "baserom.gba", 0x60d346, 0x3
+
+gUnknown_0860D349:: @ 860D349
+	.incbin "baserom.gba", 0x60d349, 0x7
+
+gUnknown_0860D350:: @ 860D350
+	.incbin "baserom.gba", 0x60d350, 0x3c
+
+gUnknown_0860D38C:: @ 860D38C
+	.incbin "baserom.gba", 0x60d38c, 0x1c
+
+gUnknown_0860D3A8:: @ 860D3A8
+	.incbin "baserom.gba", 0x60d3a8, 0x3
+
+gUnknown_0860D3AB:: @ 860D3AB
+	.incbin "baserom.gba", 0x60d3ab, 0x3
+
+gUnknown_0860D3AE:: @ 860D3AE
+	.incbin "baserom.gba", 0x60d3ae, 0x3
+
+gUnknown_0860D3B1:: @ 860D3B1
+	.incbin "baserom.gba", 0x60d3b1, 0x3
+
+gUnknown_0860D3B4:: @ 860D3B4
+	.incbin "baserom.gba", 0x60d3b4, 0x10
+
+gUnknown_0860D3C4:: @ 860D3C4
+	.incbin "baserom.gba", 0x60d3c4, 0x2
+
+gUnknown_0860D3C6:: @ 860D3C6
+	.incbin "baserom.gba", 0x60d3c6, 0x2b
+
+gUnknown_0860D3F1:: @ 860D3F1
+	.incbin "baserom.gba", 0x60d3f1, 0x1
+
+gUnknown_0860D3F2:: @ 860D3F2
+	.incbin "baserom.gba", 0x60d3f2, 0x1f
+
+gUnknown_0860D411:: @ 860D411
+	.incbin "baserom.gba", 0x60d411, 0x8ff
+
+gUnknown_0860DD10:: @ 860DD10
+	.incbin "baserom.gba", 0x60dd10, 0x100
+
+gUnknown_0860DE10:: @ 860DE10
+	.incbin "baserom.gba", 0x60de10, 0x40
+
+gUnknown_0860DE50:: @ 860DE50
+	.incbin "baserom.gba", 0x60de50, 0x28
+
+gUnknown_0860DE78:: @ 860DE78
+	.incbin "baserom.gba", 0x60de78, 0xc
+
+gUnknown_0860DE84:: @ 860DE84
+	.incbin "baserom.gba", 0x60de84, 0x14
+
+gUnknown_0860DE98:: @ 860DE98
+	.incbin "baserom.gba", 0x60de98, 0x10
+
+gUnknown_0860DEA8:: @ 860DEA8
+	.incbin "baserom.gba", 0x60dea8, 0x10
+
+gUnknown_0860DEB8:: @ 860DEB8
+	.incbin "baserom.gba", 0x60deb8, 0xb68
+
+gUnknown_0860EA20:: @ 860EA20
+	.incbin "baserom.gba", 0x60ea20, 0xc
+
+gUnknown_0860EA2C:: @ 860EA2C
+	.incbin "baserom.gba", 0x60ea2c, 0x8
+
+gUnknown_0860EA34:: @ 860EA34
+	.incbin "baserom.gba", 0x60ea34, 0x18
+
+gUnknown_0860EA4C:: @ 860EA4C
+	.incbin "baserom.gba", 0x60ea4c, 0x20
+
+gUnknown_0860EA6C:: @ 860EA6C
+	.incbin "baserom.gba", 0x60ea6c, 0x100
+
+gUnknown_0860EB6C:: @ 860EB6C
+	.incbin "baserom.gba", 0x60eb6c, 0x20
+
+gUnknown_0860EB8C:: @ 860EB8C
+	.incbin "baserom.gba", 0x60eb8c, 0x3e4
+
+gUnknown_0860EF70:: @ 860EF70
+	.incbin "baserom.gba", 0x60ef70, 0x8
+
+gUnknown_0860EF78:: @ 860EF78
+	.incbin "baserom.gba", 0x60ef78, 0x20
+
+gUnknown_0860EF98:: @ 860EF98
+	.incbin "baserom.gba", 0x60ef98, 0x8
+
+gUnknown_0860EFA0:: @ 860EFA0
+	.incbin "baserom.gba", 0x60efa0, 0xc
+
+gUnknown_0860EFAC:: @ 860EFAC
+	.incbin "baserom.gba", 0x60efac, 0x18
+
+gUnknown_0860EFC4:: @ 860EFC4
+	.incbin "baserom.gba", 0x60efc4, 0x30
+
+gUnknown_0860EFF4:: @ 860EFF4
+	.incbin "baserom.gba", 0x60eff4, 0x1c
+
+gUnknown_0860F010:: @ 860F010
+	.incbin "baserom.gba", 0x60f010, 0x10
+
+gUnknown_0860F020:: @ 860F020
+	.incbin "baserom.gba", 0x60f020, 0x54
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
new file mode 100644
index 000000000..44c14f520
--- /dev/null
+++ b/data/battle_frontier_2.s
@@ -0,0 +1,347 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0860F13C:: @ 860F13C
+	.incbin "baserom.gba", 0x60f13c, 0x1100
+
+gUnknown_0861023C:: @ 861023C
+	.incbin "baserom.gba", 0x61023c, 0x100
+
+gUnknown_0861033C:: @ 861033C
+	.incbin "baserom.gba", 0x61033c, 0x60
+
+gUnknown_0861039C:: @ 861039C
+	.incbin "baserom.gba", 0x61039c, 0x20
+
+gUnknown_086103BC:: @ 86103BC
+	.incbin "baserom.gba", 0x6103bc, 0x28
+
+gUnknown_086103E4:: @ 86103E4
+	.incbin "baserom.gba", 0x6103e4, 0x10
+
+gUnknown_086103F4:: @ 86103F4
+	.incbin "baserom.gba", 0x6103f4, 0x28
+
+gUnknown_0861041C:: @ 861041C
+	.incbin "baserom.gba", 0x61041c, 0xc
+
+gUnknown_08610428:: @ 8610428
+	.incbin "baserom.gba", 0x610428, 0xc
+
+gUnknown_08610434:: @ 8610434
+	.incbin "baserom.gba", 0x610434, 0x38
+
+gUnknown_0861046C:: @ 861046C
+	.incbin "baserom.gba", 0x61046c, 0xa
+
+gUnknown_08610476:: @ 8610476
+	.incbin "baserom.gba", 0x610476, 0x3
+
+gUnknown_08610479:: @ 8610479
+	.incbin "baserom.gba", 0x610479, 0x15f
+
+gUnknown_086105D8:: @ 86105D8
+	.incbin "baserom.gba", 0x6105d8, 0x18
+
+gUnknown_086105F0:: @ 86105F0
+	.incbin "baserom.gba", 0x6105f0, 0x18
+
+gUnknown_08610608:: @ 8610608
+	.incbin "baserom.gba", 0x610608, 0x18
+
+gUnknown_08610620:: @ 8610620
+	.incbin "baserom.gba", 0x610620, 0x18
+
+gUnknown_08610638:: @ 8610638
+	.incbin "baserom.gba", 0x610638, 0x18
+
+gUnknown_08610650:: @ 8610650
+	.incbin "baserom.gba", 0x610650, 0x50
+
+gUnknown_086106A0:: @ 86106A0
+	.incbin "baserom.gba", 0x6106a0, 0x10
+
+gUnknown_086106B0:: @ 86106B0
+	.incbin "baserom.gba", 0x6106b0, 0x184
+
+gUnknown_08610834:: @ 8610834
+	.incbin "baserom.gba", 0x610834, 0x18
+
+gUnknown_0861084C:: @ 861084C
+	.incbin "baserom.gba", 0x61084c, 0x18
+
+gUnknown_08610864:: @ 8610864
+	.incbin "baserom.gba", 0x610864, 0x18
+
+gUnknown_0861087C:: @ 861087C
+	.incbin "baserom.gba", 0x61087c, 0x18
+
+gUnknown_08610894:: @ 8610894
+	.incbin "baserom.gba", 0x610894, 0x18
+
+gUnknown_086108AC:: @ 86108AC
+	.incbin "baserom.gba", 0x6108ac, 0xc
+
+gUnknown_086108B8:: @ 86108B8
+	.incbin "baserom.gba", 0x6108b8, 0x10
+
+gUnknown_086108C8:: @ 86108C8
+	.incbin "baserom.gba", 0x6108c8, 0x50
+
+gUnknown_08610918:: @ 8610918
+	.incbin "baserom.gba", 0x610918, 0xa
+
+gUnknown_08610922:: @ 8610922
+	.incbin "baserom.gba", 0x610922, 0x3
+
+gUnknown_08610925:: @ 8610925
+	.incbin "baserom.gba", 0x610925, 0x3
+
+gUnknown_08610928:: @ 8610928
+	.incbin "baserom.gba", 0x610928, 0x20
+
+gUnknown_08610948:: @ 8610948
+	.incbin "baserom.gba", 0x610948, 0x28
+
+gUnknown_08610970:: @ 8610970
+	.incbin "baserom.gba", 0x610970, 0x34
+
+gUnknown_086109A4:: @ 86109A4
+	.incbin "baserom.gba", 0x6109a4, 0x16
+
+gUnknown_086109BA:: @ 86109BA
+	.incbin "baserom.gba", 0x6109ba, 0x536
+
+gUnknown_08610EF0:: @ 8610EF0
+	.incbin "baserom.gba", 0x610ef0, 0x100
+
+gUnknown_08610FF0:: @ 8610FF0
+	.incbin "baserom.gba", 0x610ff0, 0x80
+
+gUnknown_08611070:: @ 8611070
+	.incbin "baserom.gba", 0x611070, 0x140
+
+gUnknown_086111B0:: @ 86111B0
+	.incbin "baserom.gba", 0x6111b0, 0x80
+
+gUnknown_08611230:: @ 8611230
+	.incbin "baserom.gba", 0x611230, 0x80
+
+gUnknown_086112B0:: @ 86112B0
+	.incbin "baserom.gba", 0x6112b0, 0x80
+
+gUnknown_08611330:: @ 8611330
+	.incbin "baserom.gba", 0x611330, 0x40
+
+gUnknown_08611370:: @ 8611370
+	.incbin "baserom.gba", 0x611370, 0x163
+
+gUnknown_086114D3:: @ 86114D3
+	.incbin "baserom.gba", 0x6114d3, 0xd
+
+gUnknown_086114E0:: @ 86114E0
+	.incbin "baserom.gba", 0x6114e0, 0x68
+
+gUnknown_08611548:: @ 8611548
+	.incbin "baserom.gba", 0x611548, 0x8
+
+gUnknown_08611550:: @ 8611550
+	.incbin "baserom.gba", 0x611550, 0x1c
+
+gUnknown_0861156C:: @ 861156C
+	.incbin "baserom.gba", 0x61156c, 0xc
+
+gUnknown_08611578:: @ 8611578
+	.incbin "baserom.gba", 0x611578, 0x33c
+
+gUnknown_086118B4:: @ 86118B4
+	.incbin "baserom.gba", 0x6118b4, 0x348
+
+gUnknown_08611BFC:: @ 8611BFC
+	.incbin "baserom.gba", 0x611bfc, 0x1c
+
+gUnknown_08611C18:: @ 8611C18
+	.incbin "baserom.gba", 0x611c18, 0x5c
+
+gUnknown_08611C74:: @ 8611C74
+	.incbin "baserom.gba", 0x611c74, 0x8
+
+gUnknown_08611C7C:: @ 8611C7C
+	.incbin "baserom.gba", 0x611c7c, 0x8
+
+gUnknown_08611C84:: @ 8611C84
+	.incbin "baserom.gba", 0x611c84, 0x8
+
+gUnknown_08611C8C:: @ 8611C8C
+	.incbin "baserom.gba", 0x611c8c, 0xe
+
+gUnknown_08611C9A:: @ 8611C9A
+	.incbin "baserom.gba", 0x611c9a, 0x16
+
+gUnknown_08611CB0:: @ 8611CB0
+	.incbin "baserom.gba", 0x611cb0, 0x50
+
+gUnknown_08611D00:: @ 8611D00
+	.incbin "baserom.gba", 0x611d00, 0x8
+
+gUnknown_08611D08:: @ 8611D08
+	.incbin "baserom.gba", 0x611d08, 0x28
+
+gUnknown_08611D30:: @ 8611D30
+	.incbin "baserom.gba", 0x611d30, 0x80
+
+gUnknown_08611DB0:: @ 8611DB0
+	.incbin "baserom.gba", 0x611db0, 0x8
+
+gUnknown_08611DB8:: @ 8611DB8
+	.incbin "baserom.gba", 0x611db8, 0x8
+
+@ 8611DC0
+	.include "data/battle_frontier/battle_arena_move_mind_ratings.inc"
+
+	.align 2
+@ 8611F24
+	.incbin "baserom.gba", 0x611f24, 0x38
+
+gUnknown_08611F5C:: @ 8611F5C
+	.incbin "baserom.gba", 0x611f5c, 0x18
+
+gUnknown_08611F74:: @ 8611F74
+	.incbin "baserom.gba", 0x611f74, 0x10
+
+gUnknown_08611F84:: @ 8611F84
+	.incbin "baserom.gba", 0x611f84, 0x1c
+
+gUnknown_08611FA0:: @ 8611FA0
+	.incbin "baserom.gba", 0x611fa0, 0xc
+
+gUnknown_08611FAC:: @ 8611FAC
+	.incbin "baserom.gba", 0x611fac, 0x14
+
+@ 8611FC0
+	.include "data/battle_frontier/battle_factory_style_move_lists.inc"
+
+gUnknown_08612120:: @ 8612120
+	.incbin "baserom.gba", 0x612120, 0x44
+
+gUnknown_08612164:: @ 8612164
+	.incbin "baserom.gba", 0x612164, 0x10
+
+gUnknown_08612174:: @ 8612174
+	.incbin "baserom.gba", 0x612174, 0x10
+
+gUnknown_08612184:: @ 8612184
+	.incbin "baserom.gba", 0x612184, 0x10
+
+gUnknown_08612194:: @ 8612194
+	.incbin "baserom.gba", 0x612194, 0x180
+
+gUnknown_08612314:: @ 8612314
+	.incbin "baserom.gba", 0x612314, 0x8
+
+gUnknown_0861231C:: @ 861231C
+	.incbin "baserom.gba", 0x61231c, 0xc8
+
+gUnknown_086123E4:: @ 86123E4
+	.incbin "baserom.gba", 0x6123e4, 0x1f8
+
+gUnknown_086125DC:: @ 86125DC
+	.incbin "baserom.gba", 0x6125dc, 0x1c
+
+gUnknown_086125F8:: @ 86125F8
+	.incbin "baserom.gba", 0x6125f8, 0x74
+
+gUnknown_0861266C:: @ 861266C
+	.incbin "baserom.gba", 0x61266c, 0x9
+
+gUnknown_08612675:: @ 8612675
+	.incbin "baserom.gba", 0x612675, 0x13
+
+gUnknown_08612688:: @ 8612688
+	.incbin "baserom.gba", 0x612688, 0x8
+
+gUnknown_08612690:: @ 8612690
+	.incbin "baserom.gba", 0x612690, 0x8
+
+gUnknown_08612698:: @ 8612698
+	.incbin "baserom.gba", 0x612698, 0x4
+
+gUnknown_0861269C:: @ 861269C
+	.incbin "baserom.gba", 0x61269c, 0x4
+
+gUnknown_086126A0:: @ 86126A0
+	.incbin "baserom.gba", 0x6126a0, 0x4
+
+gUnknown_086126A4:: @ 86126A4
+	.incbin "baserom.gba", 0x6126a4, 0x4
+
+gUnknown_086126A8:: @ 86126A8
+	.incbin "baserom.gba", 0x6126a8, 0x2
+
+gUnknown_086126AA:: @ 86126AA
+	.incbin "baserom.gba", 0x6126aa, 0x2
+
+gUnknown_086126AC:: @ 86126AC
+	.incbin "baserom.gba", 0x6126ac, 0x2
+
+gUnknown_086126AE:: @ 86126AE
+	.incbin "baserom.gba", 0x6126ae, 0x2
+
+@ 86126B0
+	.include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc"
+
+@ 8612E80
+	.include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc"
+
+gUnknown_08613650:: @ 8613650
+	.incbin "baserom.gba", 0x613650, 0x5
+
+gUnknown_08613655:: @ 8613655
+	.incbin "baserom.gba", 0x613655, 0xfb
+
+gUnknown_08613750:: @ 8613750
+	.incbin "baserom.gba", 0x613750, 0x44
+
+gUnknown_08613794:: @ 8613794
+	.incbin "baserom.gba", 0x613794, 0x8
+
+gUnknown_0861379C:: @ 861379C
+	.incbin "baserom.gba", 0x61379c, 0x190
+
+gUnknown_0861392C:: @ 861392C
+	.incbin "baserom.gba", 0x61392c, 0x190
+
+gUnknown_08613ABC:: @ 8613ABC
+	.incbin "baserom.gba", 0x613abc, 0x7e
+
+gUnknown_08613B3A:: @ 8613B3A
+	.incbin "baserom.gba", 0x613b3a, 0xa
+
+gUnknown_08613B44:: @ 8613B44
+	.incbin "baserom.gba", 0x613b44, 0xd8
+
+gUnknown_08613C1C:: @ 8613C1C
+	.incbin "baserom.gba", 0x613c1c, 0x2a4
+
+gUnknown_08613EC0:: @ 8613EC0
+	.incbin "baserom.gba", 0x613ec0, 0x18
+
+gUnknown_08613ED8:: @ 8613ED8
+	.incbin "baserom.gba", 0x613ed8, 0x8
+
+gUnknown_08613EE0:: @ 8613EE0
+	.incbin "baserom.gba", 0x613ee0, 0x48
+
+gUnknown_08613F28:: @ 8613F28
+	.incbin "baserom.gba", 0x613f28, 0xc
+
+gUnknown_08613F34:: @ 8613F34
+	.incbin "baserom.gba", 0x613f34, 0x12
+
+gUnknown_08613F46:: @ 8613F46
+	.incbin "baserom.gba", 0x613f46, 0x40
+
+gUnknown_08613F86:: @ 8613F86
+	.incbin "baserom.gba", 0x613f86, 0xa
diff --git a/data/battle_tent.s b/data/battle_tent.s
new file mode 100644
index 000000000..0fd1f28ea
--- /dev/null
+++ b/data/battle_tent.s
@@ -0,0 +1,22 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_086160B4:: @ 86160B4
+	.incbin "baserom.gba", 0x6160b4, 0x20
+
+gUnknown_086160D4:: @ 86160D4
+	.incbin "baserom.gba", 0x6160d4, 0x4
+
+gUnknown_086160D8:: @ 86160D8
+	.incbin "baserom.gba", 0x6160d8, 0x1c
+
+gUnknown_086160F4:: @ 86160F4
+	.incbin "baserom.gba", 0x6160f4, 0x4
+
+gUnknown_086160F8:: @ 86160F8
+	.incbin "baserom.gba", 0x6160f8, 0x28
+
+gUnknown_08616120:: @ 8616120
+	.incbin "baserom.gba", 0x616120, 0x4
diff --git a/data/data_emerald.s b/data/data_emerald.s
deleted file mode 100644
index f27668217..000000000
--- a/data/data_emerald.s
+++ /dev/null
@@ -1,958 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-    @ This section was decompiled in battle_dome_cards.
-    @ On its merge, this section should be deleted.
-    @ This section contains three objects and accounts for 28 bytes.
-
-	.section .rodata
-
-gUnknown_0860B358:: @ 860B358
-	.incbin "baserom.gba", 0x60b358, 0x1630
-
-gUnknown_0860C988:: @ 860C988
-	.incbin "baserom.gba", 0x60c988, 0x269
-
-gUnknown_0860CBF1:: @ 860CBF1
-	.incbin "baserom.gba", 0x60cbf1, 0x283
-
-gUnknown_0860CE74:: @ 860CE74
-	.incbin "baserom.gba", 0x60ce74, 0x10
-
-gUnknown_0860CE84:: @ 860CE84
-	.incbin "baserom.gba", 0x60ce84, 0x10
-
-gUnknown_0860CE94:: @ 860CE94
-	.incbin "baserom.gba", 0x60ce94, 0x20
-
-gUnknown_0860CEB4:: @ 860CEB4
-	.incbin "baserom.gba", 0x60ceb4, 0x90
-
-gUnknown_0860CF44:: @ 860CF44
-	.incbin "baserom.gba", 0x60cf44, 0xc
-
-gUnknown_0860CF50:: @ 860CF50
-	.incbin "baserom.gba", 0x60cf50, 0x58
-
-gUnknown_0860CFA8:: @ 860CFA8
-	.incbin "baserom.gba", 0x60cfa8, 0x30
-
-gUnknown_0860CFD8:: @ 860CFD8
-	.incbin "baserom.gba", 0x60cfd8, 0x30
-
-gUnknown_0860D008:: @ 860D008
-	.incbin "baserom.gba", 0x60d008, 0x48
-
-gUnknown_0860D050:: @ 860D050
-	.incbin "baserom.gba", 0x60d050, 0x18
-
-gUnknown_0860D068:: @ 860D068
-	.incbin "baserom.gba", 0x60d068, 0x18
-
-gUnknown_0860D080:: @ 860D080
-	.incbin "baserom.gba", 0x60d080, 0x10
-
-gUnknown_0860D090:: @ 860D090
-	.incbin "baserom.gba", 0x60d090, 0x5c
-
-gUnknown_0860D0EC:: @ 860D0EC
-	.incbin "baserom.gba", 0x60d0ec, 0x10
-
-gUnknown_0860D0FC:: @ 860D0FC
-	.incbin "baserom.gba", 0x60d0fc, 0x10
-
-gUnknown_0860D10C:: @ 860D10C
-	.incbin "baserom.gba", 0x60d10c, 0x40
-
-gUnknown_0860D14C:: @ 860D14C
-	.incbin "baserom.gba", 0x60d14c, 0x10
-
-gUnknown_0860D15C:: @ 860D15C
-	.incbin "baserom.gba", 0x60d15c, 0x40
-
-gUnknown_0860D19C:: @ 860D19C
-	.incbin "baserom.gba", 0x60d19c, 0x4
-
-gUnknown_0860D1A0:: @ 860D1A0
-	.incbin "baserom.gba", 0x60d1a0, 0x20
-
-gUnknown_0860D1C0:: @ 860D1C0
-	.incbin "baserom.gba", 0x60d1c0, 0x10
-
-gUnknown_0860D1D0:: @ 860D1D0
-	.incbin "baserom.gba", 0x60d1d0, 0x44
-
-gUnknown_0860D214:: @ 860D214
-	.incbin "baserom.gba", 0x60d214, 0x80
-
-gUnknown_0860D294:: @ 860D294
-	.incbin "baserom.gba", 0x60d294, 0xac
-
-gUnknown_0860D340:: @ 860D340
-	.incbin "baserom.gba", 0x60d340, 0x3
-
-gUnknown_0860D343:: @ 860D343
-	.incbin "baserom.gba", 0x60d343, 0x3
-
-gUnknown_0860D346:: @ 860D346
-	.incbin "baserom.gba", 0x60d346, 0x3
-
-gUnknown_0860D349:: @ 860D349
-	.incbin "baserom.gba", 0x60d349, 0x7
-
-gUnknown_0860D350:: @ 860D350
-	.incbin "baserom.gba", 0x60d350, 0x3c
-
-gUnknown_0860D38C:: @ 860D38C
-	.incbin "baserom.gba", 0x60d38c, 0x1c
-
-gUnknown_0860D3A8:: @ 860D3A8
-	.incbin "baserom.gba", 0x60d3a8, 0x3
-
-gUnknown_0860D3AB:: @ 860D3AB
-	.incbin "baserom.gba", 0x60d3ab, 0x3
-
-gUnknown_0860D3AE:: @ 860D3AE
-	.incbin "baserom.gba", 0x60d3ae, 0x3
-
-gUnknown_0860D3B1:: @ 860D3B1
-	.incbin "baserom.gba", 0x60d3b1, 0x3
-
-gUnknown_0860D3B4:: @ 860D3B4
-	.incbin "baserom.gba", 0x60d3b4, 0x10
-
-gUnknown_0860D3C4:: @ 860D3C4
-	.incbin "baserom.gba", 0x60d3c4, 0x2
-
-gUnknown_0860D3C6:: @ 860D3C6
-	.incbin "baserom.gba", 0x60d3c6, 0x2b
-
-gUnknown_0860D3F1:: @ 860D3F1
-	.incbin "baserom.gba", 0x60d3f1, 0x1
-
-gUnknown_0860D3F2:: @ 860D3F2
-	.incbin "baserom.gba", 0x60d3f2, 0x1f
-
-gUnknown_0860D411:: @ 860D411
-	.incbin "baserom.gba", 0x60d411, 0x8ff
-
-gUnknown_0860DD10:: @ 860DD10
-	.incbin "baserom.gba", 0x60dd10, 0x100
-
-gUnknown_0860DE10:: @ 860DE10
-	.incbin "baserom.gba", 0x60de10, 0x40
-
-gUnknown_0860DE50:: @ 860DE50
-	.incbin "baserom.gba", 0x60de50, 0x28
-
-gUnknown_0860DE78:: @ 860DE78
-	.incbin "baserom.gba", 0x60de78, 0xc
-
-gUnknown_0860DE84:: @ 860DE84
-	.incbin "baserom.gba", 0x60de84, 0x14
-
-gUnknown_0860DE98:: @ 860DE98
-	.incbin "baserom.gba", 0x60de98, 0x10
-
-gUnknown_0860DEA8:: @ 860DEA8
-	.incbin "baserom.gba", 0x60dea8, 0x10
-
-gUnknown_0860DEB8:: @ 860DEB8
-	.incbin "baserom.gba", 0x60deb8, 0xb68
-
-gUnknown_0860EA20:: @ 860EA20
-	.incbin "baserom.gba", 0x60ea20, 0xc
-
-gUnknown_0860EA2C:: @ 860EA2C
-	.incbin "baserom.gba", 0x60ea2c, 0x8
-
-gUnknown_0860EA34:: @ 860EA34
-	.incbin "baserom.gba", 0x60ea34, 0x18
-
-gUnknown_0860EA4C:: @ 860EA4C
-	.incbin "baserom.gba", 0x60ea4c, 0x20
-
-gUnknown_0860EA6C:: @ 860EA6C
-	.incbin "baserom.gba", 0x60ea6c, 0x100
-
-gUnknown_0860EB6C:: @ 860EB6C
-	.incbin "baserom.gba", 0x60eb6c, 0x20
-
-gUnknown_0860EB8C:: @ 860EB8C
-	.incbin "baserom.gba", 0x60eb8c, 0x3e4
-
-gUnknown_0860EF70:: @ 860EF70
-	.incbin "baserom.gba", 0x60ef70, 0x8
-
-gUnknown_0860EF78:: @ 860EF78
-	.incbin "baserom.gba", 0x60ef78, 0x20
-
-gUnknown_0860EF98:: @ 860EF98
-	.incbin "baserom.gba", 0x60ef98, 0x8
-
-gUnknown_0860EFA0:: @ 860EFA0
-	.incbin "baserom.gba", 0x60efa0, 0xc
-
-gUnknown_0860EFAC:: @ 860EFAC
-	.incbin "baserom.gba", 0x60efac, 0x18
-
-gUnknown_0860EFC4:: @ 860EFC4
-	.incbin "baserom.gba", 0x60efc4, 0x30
-
-gUnknown_0860EFF4:: @ 860EFF4
-	.incbin "baserom.gba", 0x60eff4, 0x1c
-
-gUnknown_0860F010:: @ 860F010
-	.incbin "baserom.gba", 0x60f010, 0x10
-
-gUnknown_0860F020:: @ 860F020
-	.incbin "baserom.gba", 0x60f020, 0x54
-
-gUnknown_0860F074:: @ 860F074
-	.incbin "baserom.gba", 0x60f074, 0x20
-
-gUnknown_0860F094:: @ 860F094
-	.incbin "baserom.gba", 0x60f094, 0x4
-
-gUnknown_0860F098:: @ 860F098
-	.incbin "baserom.gba", 0x60f098, 0x10
-
-gUnknown_0860F0A8:: @ 860F0A8
-	.incbin "baserom.gba", 0x60f0a8, 0x8
-
-gUnknown_0860F0B0:: @ 860F0B0
-	.incbin "baserom.gba", 0x60f0b0, 0x20
-
-gUnknown_0860F0D0:: @ 860F0D0
-	.incbin "baserom.gba", 0x60f0d0, 0x4
-
-gUnknown_0860F0D4:: @ 860F0D4
-	.incbin "baserom.gba", 0x60f0d4, 0x68
-
-gUnknown_0860F13C:: @ 860F13C
-	.incbin "baserom.gba", 0x60f13c, 0x1100
-
-gUnknown_0861023C:: @ 861023C
-	.incbin "baserom.gba", 0x61023c, 0x100
-
-gUnknown_0861033C:: @ 861033C
-	.incbin "baserom.gba", 0x61033c, 0x60
-
-gUnknown_0861039C:: @ 861039C
-	.incbin "baserom.gba", 0x61039c, 0x20
-
-gUnknown_086103BC:: @ 86103BC
-	.incbin "baserom.gba", 0x6103bc, 0x28
-
-gUnknown_086103E4:: @ 86103E4
-	.incbin "baserom.gba", 0x6103e4, 0x10
-
-gUnknown_086103F4:: @ 86103F4
-	.incbin "baserom.gba", 0x6103f4, 0x28
-
-gUnknown_0861041C:: @ 861041C
-	.incbin "baserom.gba", 0x61041c, 0xc
-
-gUnknown_08610428:: @ 8610428
-	.incbin "baserom.gba", 0x610428, 0xc
-
-gUnknown_08610434:: @ 8610434
-	.incbin "baserom.gba", 0x610434, 0x38
-
-gUnknown_0861046C:: @ 861046C
-	.incbin "baserom.gba", 0x61046c, 0xa
-
-gUnknown_08610476:: @ 8610476
-	.incbin "baserom.gba", 0x610476, 0x3
-
-gUnknown_08610479:: @ 8610479
-	.incbin "baserom.gba", 0x610479, 0x15f
-
-gUnknown_086105D8:: @ 86105D8
-	.incbin "baserom.gba", 0x6105d8, 0x18
-
-gUnknown_086105F0:: @ 86105F0
-	.incbin "baserom.gba", 0x6105f0, 0x18
-
-gUnknown_08610608:: @ 8610608
-	.incbin "baserom.gba", 0x610608, 0x18
-
-gUnknown_08610620:: @ 8610620
-	.incbin "baserom.gba", 0x610620, 0x18
-
-gUnknown_08610638:: @ 8610638
-	.incbin "baserom.gba", 0x610638, 0x18
-
-gUnknown_08610650:: @ 8610650
-	.incbin "baserom.gba", 0x610650, 0x50
-
-gUnknown_086106A0:: @ 86106A0
-	.incbin "baserom.gba", 0x6106a0, 0x10
-
-gUnknown_086106B0:: @ 86106B0
-	.incbin "baserom.gba", 0x6106b0, 0x184
-
-gUnknown_08610834:: @ 8610834
-	.incbin "baserom.gba", 0x610834, 0x18
-
-gUnknown_0861084C:: @ 861084C
-	.incbin "baserom.gba", 0x61084c, 0x18
-
-gUnknown_08610864:: @ 8610864
-	.incbin "baserom.gba", 0x610864, 0x18
-
-gUnknown_0861087C:: @ 861087C
-	.incbin "baserom.gba", 0x61087c, 0x18
-
-gUnknown_08610894:: @ 8610894
-	.incbin "baserom.gba", 0x610894, 0x18
-
-gUnknown_086108AC:: @ 86108AC
-	.incbin "baserom.gba", 0x6108ac, 0xc
-
-gUnknown_086108B8:: @ 86108B8
-	.incbin "baserom.gba", 0x6108b8, 0x10
-
-gUnknown_086108C8:: @ 86108C8
-	.incbin "baserom.gba", 0x6108c8, 0x50
-
-gUnknown_08610918:: @ 8610918
-	.incbin "baserom.gba", 0x610918, 0xa
-
-gUnknown_08610922:: @ 8610922
-	.incbin "baserom.gba", 0x610922, 0x3
-
-gUnknown_08610925:: @ 8610925
-	.incbin "baserom.gba", 0x610925, 0x3
-
-gUnknown_08610928:: @ 8610928
-	.incbin "baserom.gba", 0x610928, 0x20
-
-gUnknown_08610948:: @ 8610948
-	.incbin "baserom.gba", 0x610948, 0x28
-
-gUnknown_08610970:: @ 8610970
-	.incbin "baserom.gba", 0x610970, 0x34
-
-gUnknown_086109A4:: @ 86109A4
-	.incbin "baserom.gba", 0x6109a4, 0x16
-
-gUnknown_086109BA:: @ 86109BA
-	.incbin "baserom.gba", 0x6109ba, 0x536
-
-gUnknown_08610EF0:: @ 8610EF0
-	.incbin "baserom.gba", 0x610ef0, 0x100
-
-gUnknown_08610FF0:: @ 8610FF0
-	.incbin "baserom.gba", 0x610ff0, 0x80
-
-gUnknown_08611070:: @ 8611070
-	.incbin "baserom.gba", 0x611070, 0x140
-
-gUnknown_086111B0:: @ 86111B0
-	.incbin "baserom.gba", 0x6111b0, 0x80
-
-gUnknown_08611230:: @ 8611230
-	.incbin "baserom.gba", 0x611230, 0x80
-
-gUnknown_086112B0:: @ 86112B0
-	.incbin "baserom.gba", 0x6112b0, 0x80
-
-gUnknown_08611330:: @ 8611330
-	.incbin "baserom.gba", 0x611330, 0x40
-
-gUnknown_08611370:: @ 8611370
-	.incbin "baserom.gba", 0x611370, 0x163
-
-gUnknown_086114D3:: @ 86114D3
-	.incbin "baserom.gba", 0x6114d3, 0xd
-
-gUnknown_086114E0:: @ 86114E0
-	.incbin "baserom.gba", 0x6114e0, 0x68
-
-gUnknown_08611548:: @ 8611548
-	.incbin "baserom.gba", 0x611548, 0x8
-
-gUnknown_08611550:: @ 8611550
-	.incbin "baserom.gba", 0x611550, 0x1c
-
-gUnknown_0861156C:: @ 861156C
-	.incbin "baserom.gba", 0x61156c, 0xc
-
-gUnknown_08611578:: @ 8611578
-	.incbin "baserom.gba", 0x611578, 0x33c
-
-gUnknown_086118B4:: @ 86118B4
-	.incbin "baserom.gba", 0x6118b4, 0x348
-
-gUnknown_08611BFC:: @ 8611BFC
-	.incbin "baserom.gba", 0x611bfc, 0x1c
-
-gUnknown_08611C18:: @ 8611C18
-	.incbin "baserom.gba", 0x611c18, 0x5c
-
-gUnknown_08611C74:: @ 8611C74
-	.incbin "baserom.gba", 0x611c74, 0x8
-
-gUnknown_08611C7C:: @ 8611C7C
-	.incbin "baserom.gba", 0x611c7c, 0x8
-
-gUnknown_08611C84:: @ 8611C84
-	.incbin "baserom.gba", 0x611c84, 0x8
-
-gUnknown_08611C8C:: @ 8611C8C
-	.incbin "baserom.gba", 0x611c8c, 0xe
-
-gUnknown_08611C9A:: @ 8611C9A
-	.incbin "baserom.gba", 0x611c9a, 0x16
-
-gUnknown_08611CB0:: @ 8611CB0
-	.incbin "baserom.gba", 0x611cb0, 0x50
-
-gUnknown_08611D00:: @ 8611D00
-	.incbin "baserom.gba", 0x611d00, 0x8
-
-gUnknown_08611D08:: @ 8611D08
-	.incbin "baserom.gba", 0x611d08, 0x28
-
-gUnknown_08611D30:: @ 8611D30
-	.incbin "baserom.gba", 0x611d30, 0x80
-
-gUnknown_08611DB0:: @ 8611DB0
-	.incbin "baserom.gba", 0x611db0, 0x8
-
-gUnknown_08611DB8:: @ 8611DB8
-	.incbin "baserom.gba", 0x611db8, 0x8
-
-@ 8611DC0
-	.include "data/battle_frontier/battle_arena_move_mind_ratings.inc"
-
-	.align 2
-@ 8611F24
-	.incbin "baserom.gba", 0x611f24, 0x38
-
-gUnknown_08611F5C:: @ 8611F5C
-	.incbin "baserom.gba", 0x611f5c, 0x18
-
-gUnknown_08611F74:: @ 8611F74
-	.incbin "baserom.gba", 0x611f74, 0x10
-
-gUnknown_08611F84:: @ 8611F84
-	.incbin "baserom.gba", 0x611f84, 0x1c
-
-gUnknown_08611FA0:: @ 8611FA0
-	.incbin "baserom.gba", 0x611fa0, 0xc
-
-gUnknown_08611FAC:: @ 8611FAC
-	.incbin "baserom.gba", 0x611fac, 0x14
-
-@ 8611FC0
-	.include "data/battle_frontier/battle_factory_style_move_lists.inc"
-
-gUnknown_08612120:: @ 8612120
-	.incbin "baserom.gba", 0x612120, 0x44
-
-gUnknown_08612164:: @ 8612164
-	.incbin "baserom.gba", 0x612164, 0x10
-
-gUnknown_08612174:: @ 8612174
-	.incbin "baserom.gba", 0x612174, 0x10
-
-gUnknown_08612184:: @ 8612184
-	.incbin "baserom.gba", 0x612184, 0x10
-
-gUnknown_08612194:: @ 8612194
-	.incbin "baserom.gba", 0x612194, 0x180
-
-gUnknown_08612314:: @ 8612314
-	.incbin "baserom.gba", 0x612314, 0x8
-
-gUnknown_0861231C:: @ 861231C
-	.incbin "baserom.gba", 0x61231c, 0xc8
-
-gUnknown_086123E4:: @ 86123E4
-	.incbin "baserom.gba", 0x6123e4, 0x1f8
-
-gUnknown_086125DC:: @ 86125DC
-	.incbin "baserom.gba", 0x6125dc, 0x1c
-
-gUnknown_086125F8:: @ 86125F8
-	.incbin "baserom.gba", 0x6125f8, 0x74
-
-gUnknown_0861266C:: @ 861266C
-	.incbin "baserom.gba", 0x61266c, 0x9
-
-gUnknown_08612675:: @ 8612675
-	.incbin "baserom.gba", 0x612675, 0x13
-
-gUnknown_08612688:: @ 8612688
-	.incbin "baserom.gba", 0x612688, 0x8
-
-gUnknown_08612690:: @ 8612690
-	.incbin "baserom.gba", 0x612690, 0x8
-
-gUnknown_08612698:: @ 8612698
-	.incbin "baserom.gba", 0x612698, 0x4
-
-gUnknown_0861269C:: @ 861269C
-	.incbin "baserom.gba", 0x61269c, 0x4
-
-gUnknown_086126A0:: @ 86126A0
-	.incbin "baserom.gba", 0x6126a0, 0x4
-
-gUnknown_086126A4:: @ 86126A4
-	.incbin "baserom.gba", 0x6126a4, 0x4
-
-gUnknown_086126A8:: @ 86126A8
-	.incbin "baserom.gba", 0x6126a8, 0x2
-
-gUnknown_086126AA:: @ 86126AA
-	.incbin "baserom.gba", 0x6126aa, 0x2
-
-gUnknown_086126AC:: @ 86126AC
-	.incbin "baserom.gba", 0x6126ac, 0x2
-
-gUnknown_086126AE:: @ 86126AE
-	.incbin "baserom.gba", 0x6126ae, 0x2
-
-@ 86126B0
-	.include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc"
-
-@ 8612E80
-	.include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc"
-
-gUnknown_08613650:: @ 8613650
-	.incbin "baserom.gba", 0x613650, 0x5
-
-gUnknown_08613655:: @ 8613655
-	.incbin "baserom.gba", 0x613655, 0xfb
-
-gUnknown_08613750:: @ 8613750
-	.incbin "baserom.gba", 0x613750, 0x44
-
-gUnknown_08613794:: @ 8613794
-	.incbin "baserom.gba", 0x613794, 0x8
-
-gUnknown_0861379C:: @ 861379C
-	.incbin "baserom.gba", 0x61379c, 0x190
-
-gUnknown_0861392C:: @ 861392C
-	.incbin "baserom.gba", 0x61392c, 0x190
-
-gUnknown_08613ABC:: @ 8613ABC
-	.incbin "baserom.gba", 0x613abc, 0x7e
-
-gUnknown_08613B3A:: @ 8613B3A
-	.incbin "baserom.gba", 0x613b3a, 0xa
-
-gUnknown_08613B44:: @ 8613B44
-	.incbin "baserom.gba", 0x613b44, 0xd8
-
-gUnknown_08613C1C:: @ 8613C1C
-	.incbin "baserom.gba", 0x613c1c, 0x2a4
-
-gUnknown_08613EC0:: @ 8613EC0
-	.incbin "baserom.gba", 0x613ec0, 0x18
-
-gUnknown_08613ED8:: @ 8613ED8
-	.incbin "baserom.gba", 0x613ed8, 0x8
-
-gUnknown_08613EE0:: @ 8613EE0
-	.incbin "baserom.gba", 0x613ee0, 0x48
-
-gUnknown_08613F28:: @ 8613F28
-	.incbin "baserom.gba", 0x613f28, 0xc
-
-gUnknown_08613F34:: @ 8613F34
-	.incbin "baserom.gba", 0x613f34, 0x12
-
-gUnknown_08613F46:: @ 8613F46
-	.incbin "baserom.gba", 0x613f46, 0x40
-
-gUnknown_08613F86:: @ 8613F86
-	.incbin "baserom.gba", 0x613f86, 0xa
-
-gUnknown_08613F90:: @ 8613F90
-	.incbin "baserom.gba", 0x613f90, 0xc
-
-gUnknown_08613F9C:: @ 8613F9C
-	.incbin "baserom.gba", 0x613f9c, 0x18
-
-gUnknown_08613FB4:: @ 8613FB4
-	.incbin "baserom.gba", 0x613fb4, 0x78
-
-gUnknown_0861402C:: @ 861402C
-	.incbin "baserom.gba", 0x61402c, 0x4
-
-gUnknown_08614030:: @ 8614030
-	.incbin "baserom.gba", 0x614030, 0x4
-
-gUnknown_08614034:: @ 8614034
-	.incbin "baserom.gba", 0x614034, 0x4
-
-gUnknown_08614038:: @ 8614038
-	.incbin "baserom.gba", 0x614038, 0x4
-
-gUnknown_0861403C:: @ 861403C
-	.incbin "baserom.gba", 0x61403c, 0x6
-
-gUnknown_08614042:: @ 8614042
-	.incbin "baserom.gba", 0x614042, 0x2
-
-gUnknown_08614044:: @ 8614044
-	.incbin "baserom.gba", 0x614044, 0x2
-
-gUnknown_08614046:: @ 8614046
-	.incbin "baserom.gba", 0x614046, 0x1
-
-gUnknown_08614047:: @ 8614047
-	.incbin "baserom.gba", 0x614047, 0x4
-
-gUnknown_0861404B:: @ 861404B
-	.incbin "baserom.gba", 0x61404b, 0x2
-
-gUnknown_0861404D:: @ 861404D
-	.incbin "baserom.gba", 0x61404d, 0x2
-
-gUnknown_0861404F:: @ 861404F
-	.incbin "baserom.gba", 0x61404f, 0x5
-
-gUnknown_08614054:: @ 8614054
-	.incbin "baserom.gba", 0x614054, 0x30
-
-gUnknown_08614084:: @ 8614084
-	.incbin "baserom.gba", 0x614084, 0x8
-
-gUnknown_0861408C:: @ 861408C
-	.incbin "baserom.gba", 0x61408c, 0x8
-
-gUnknown_08614094:: @ 8614094
-	.incbin "baserom.gba", 0x614094, 0x10
-
-gUnknown_086140A4:: @ 86140A4
-	.incbin "baserom.gba", 0x6140a4, 0xc0
-
-gUnknown_08614164:: @ 8614164
-	.incbin "baserom.gba", 0x614164, 0x10
-
-gUnknown_08614174:: @ 8614174
-	.incbin "baserom.gba", 0x614174, 0x38
-
-gUnknown_086141AC:: @ 86141AC
-	.incbin "baserom.gba", 0x6141ac, 0x50
-
-gUnknown_086141FC:: @ 86141FC
-	.incbin "baserom.gba", 0x6141fc, 0x48
-
-gUnknown_08614244:: @ 8614244
-	.incbin "baserom.gba", 0x614244, 0x18
-
-gUnknown_0861425C:: @ 861425C
-	.incbin "baserom.gba", 0x61425c, 0x4
-
-gUnknown_08614260:: @ 8614260
-	.incbin "baserom.gba", 0x614260, 0x4
-
-gUnknown_08614264:: @ 8614264
-	.incbin "baserom.gba", 0x614264, 0x4
-
-gUnknown_08614268:: @ 8614268
-	.incbin "baserom.gba", 0x614268, 0x4
-
-gUnknown_0861426C:: @ 861426C
-	.incbin "baserom.gba", 0x61426c, 0x4
-
-gUnknown_08614270:: @ 8614270
-	.incbin "baserom.gba", 0x614270, 0x4
-
-gUnknown_08614274:: @ 8614274
-	.incbin "baserom.gba", 0x614274, 0x4
-
-gUnknown_08614278:: @ 8614278
-	.incbin "baserom.gba", 0x614278, 0x18
-
-gUnknown_08614290:: @ 8614290
-	.incbin "baserom.gba", 0x614290, 0x18
-
-gUnknown_086142A8:: @ 86142A8
-	.incbin "baserom.gba", 0x6142a8, 0x20
-
-gUnknown_086142C8:: @ 86142C8
-	.incbin "baserom.gba", 0x6142c8, 0x70
-
-gUnknown_08614338:: @ 8614338
-	.incbin "baserom.gba", 0x614338, 0x40
-
-gUnknown_08614378:: @ 8614378
-	.incbin "baserom.gba", 0x614378, 0x44
-
-gUnknown_086143BC:: @ 86143BC
-	.incbin "baserom.gba", 0x6143bc, 0x4e
-
-gUnknown_0861440A:: @ 861440A
-	.incbin "baserom.gba", 0x61440a, 0x4
-
-gUnknown_0861440E:: @ 861440E
-	.incbin "baserom.gba", 0x61440e, 0x2
-
-@ 8614410
-	.include "data/graphics/items/item_icon_table.inc"
-
-@ 8614FE0
-	.incbin "baserom.gba", 0x614fe0, 0x14
-
-gUnknown_08614FF4:: @ 8614FF4
-	.incbin "baserom.gba", 0x614ff4, 0x18
-
-gUnknown_0861500C:: @ 861500C
-	.incbin "baserom.gba", 0x61500c, 0x3c
-
-gUnknown_08615048:: @ 8615048
-	.incbin "baserom.gba", 0x615048, 0x670
-
-gUnknown_086156B8:: @ 86156B8
-	.incbin "baserom.gba", 0x6156b8, 0x2c
-
-gUnknown_086156E4:: @ 86156E4
-	.incbin "baserom.gba", 0x6156e4, 0x20
-
-gUnknown_08615704:: @ 8615704
-	.incbin "baserom.gba", 0x615704, 0xc0
-
-gUnknown_086157C4:: @ 86157C4
-	.incbin "baserom.gba", 0x6157c4, 0x1c
-
-gUnknown_086157E0:: @ 86157E0
-	.incbin "baserom.gba", 0x6157e0, 0x1c
-
-gUnknown_086157FC:: @ 86157FC
-	.incbin "baserom.gba", 0x6157fc, 0x14
-
-gUnknown_08615810:: @ 8615810
-	.incbin "baserom.gba", 0x615810, 0x40
-
-gUnknown_08615850:: @ 8615850
-	.incbin "baserom.gba", 0x615850, 0x40
-
-gUnknown_08615890:: @ 8615890
-	.incbin "baserom.gba", 0x615890, 0x40
-
-gUnknown_086158D0:: @ 86158D0
-	.incbin "baserom.gba", 0x6158d0, 0x38
-
-gUnknown_08615908:: @ 8615908
-	.incbin "baserom.gba", 0x615908, 0x8
-
-gUnknown_08615910:: @ 8615910
-	.incbin "baserom.gba", 0x615910, 0x8
-
-gUnknown_08615918:: @ 8615918
-	.incbin "baserom.gba", 0x615918, 0x8
-
-gUnknown_08615920:: @ 8615920
-	.incbin "baserom.gba", 0x615920, 0x8
-
-gUnknown_08615928:: @ 8615928
-	.incbin "baserom.gba", 0x615928, 0x8
-
-gUnknown_08615930:: @ 8615930
-	.incbin "baserom.gba", 0x615930, 0x8
-
-gUnknown_08615938:: @ 8615938
-	.incbin "baserom.gba", 0x615938, 0x8
-
-gUnknown_08615940:: @ 8615940
-	.incbin "baserom.gba", 0x615940, 0x8
-
-gUnknown_08615948:: @ 8615948
-	.incbin "baserom.gba", 0x615948, 0x8
-
-gUnknown_08615950:: @ 8615950
-	.incbin "baserom.gba", 0x615950, 0x8
-
-gUnknown_08615958:: @ 8615958
-	.incbin "baserom.gba", 0x615958, 0x8
-
-gUnknown_08615960:: @ 8615960
-	.incbin "baserom.gba", 0x615960, 0x8
-
-gUnknown_08615968:: @ 8615968
-	.incbin "baserom.gba", 0x615968, 0x8
-
-gUnknown_08615970:: @ 8615970
-	.incbin "baserom.gba", 0x615970, 0x18
-
-gUnknown_08615988:: @ 8615988
-	.incbin "baserom.gba", 0x615988, 0x46
-
-gUnknown_086159CE:: @ 86159CE
-	.incbin "baserom.gba", 0x6159ce, 0x46
-
-gUnknown_08615A14:: @ 8615A14
-	.incbin "baserom.gba", 0x615a14, 0x36
-
-gUnknown_08615A4A:: @ 8615A4A
-	.incbin "baserom.gba", 0x615a4a, 0x36
-
-gUnknown_08615A80:: @ 8615A80
-	.incbin "baserom.gba", 0x615a80, 0x36
-
-gUnknown_08615AB6:: @ 8615AB6
-	.incbin "baserom.gba", 0x615ab6, 0x2
-
-gUnknown_08615AB8:: @ 8615AB8
-	.incbin "baserom.gba", 0x615ab8, 0x2
-
-gUnknown_08615ABA:: @ 8615ABA
-	.incbin "baserom.gba", 0x615aba, 0x3
-
-gUnknown_08615ABD:: @ 8615ABD
-	.incbin "baserom.gba", 0x615abd, 0x3
-
-gUnknown_08615AC0:: @ 8615AC0
-	.incbin "baserom.gba", 0x615ac0, 0x3
-
-gUnknown_08615AC3:: @ 8615AC3
-	.incbin "baserom.gba", 0x615ac3, 0x2
-
-gUnknown_08615AC5:: @ 8615AC5
-	.incbin "baserom.gba", 0x615ac5, 0x2
-
-gUnknown_08615AC7:: @ 8615AC7
-	.incbin "baserom.gba", 0x615ac7, 0x2
-
-gUnknown_08615AC9:: @ 8615AC9
-	.incbin "baserom.gba", 0x615ac9, 0x2
-
-gUnknown_08615ACB:: @ 8615ACB
-	.incbin "baserom.gba", 0x615acb, 0x2
-
-gUnknown_08615ACD:: @ 8615ACD
-	.incbin "baserom.gba", 0x615acd, 0x3
-
-gUnknown_08615AD0:: @ 8615AD0
-	.incbin "baserom.gba", 0x615ad0, 0x3
-
-gUnknown_08615AD3:: @ 8615AD3
-	.incbin "baserom.gba", 0x615ad3, 0x3
-
-gUnknown_08615AD6:: @ 8615AD6
-	.incbin "baserom.gba", 0x615ad6, 0x3
-
-gUnknown_08615AD9:: @ 8615AD9
-	.incbin "baserom.gba", 0x615ad9, 0x3
-
-gUnknown_08615ADC:: @ 8615ADC
-	.incbin "baserom.gba", 0x615adc, 0x3
-
-gUnknown_08615ADF:: @ 8615ADF
-	.incbin "baserom.gba", 0x615adf, 0x3
-
-gUnknown_08615AE2:: @ 8615AE2
-	.incbin "baserom.gba", 0x615ae2, 0x3
-
-gUnknown_08615AE5:: @ 8615AE5
-	.incbin "baserom.gba", 0x615ae5, 0x3
-
-gUnknown_08615AE8:: @ 8615AE8
-	.incbin "baserom.gba", 0x615ae8, 0x3
-
-gUnknown_08615AEB:: @ 8615AEB
-	.incbin "baserom.gba", 0x615aeb, 0x3
-
-gUnknown_08615AEE:: @ 8615AEE
-	.incbin "baserom.gba", 0x615aee, 0x3
-
-gUnknown_08615AF1:: @ 8615AF1
-	.incbin "baserom.gba", 0x615af1, 0x3
-
-gUnknown_08615AF4:: @ 8615AF4
-	.incbin "baserom.gba", 0x615af4, 0x6c
-
-gUnknown_08615B60:: @ 8615B60
-	.incbin "baserom.gba", 0x615b60, 0xa8
-
-gUnknown_08615C08:: @ 8615C08
-	.incbin "baserom.gba", 0x615c08, 0x130
-
-gUnknown_08615D38:: @ 8615D38
-	.incbin "baserom.gba", 0x615d38, 0x38
-
-gUnknown_08615D70:: @ 8615D70
-	.incbin "baserom.gba", 0x615d70, 0xe
-
-gUnknown_08615D7E:: @ 8615D7E
-	.incbin "baserom.gba", 0x615d7e, 0x1e
-
-gUnknown_08615D9C:: @ 8615D9C
-	.incbin "baserom.gba", 0x615d9c, 0x70
-
-gUnknown_08615E0C:: @ 8615E0C
-	.incbin "baserom.gba", 0x615e0c, 0xa4
-
-gUnknown_08615EB0:: @ 8615EB0
-	.incbin "baserom.gba", 0x615eb0, 0x8
-
-gUnknown_08615EB8:: @ 8615EB8
-	.incbin "baserom.gba", 0x615eb8, 0x8
-
-gUnknown_08615EC0:: @ 8615EC0
-	.incbin "baserom.gba", 0x615ec0, 0x38
-
-gUnknown_08615EF8:: @ 8615EF8
-	.incbin "baserom.gba", 0x615ef8, 0x8
-
-gUnknown_08615F00:: @ 8615F00
-	.incbin "baserom.gba", 0x615f00, 0x8
-
-gUnknown_08615F08:: @ 8615F08
-	.incbin "baserom.gba", 0x615f08, 0x68
-
-gUnknown_08615F70:: @ 8615F70
-	.incbin "baserom.gba", 0x615f70, 0x8
-
-gUnknown_08615F78:: @ 8615F78
-	.incbin "baserom.gba", 0x615f78, 0x80
-
-gUnknown_08615FF8:: @ 8615FF8
-	.incbin "baserom.gba", 0x615ff8, 0x8
-
-gUnknown_08616000:: @ 8616000
-	.incbin "baserom.gba", 0x616000, 0x8
-
-gUnknown_08616008:: @ 8616008
-	.incbin "baserom.gba", 0x616008, 0x18
-
-gUnknown_08616020:: @ 8616020
-	.incbin "baserom.gba", 0x616020, 0x20
-
-gUnknown_08616040:: @ 8616040
-	.incbin "baserom.gba", 0x616040, 0x74
-
-gUnknown_086160B4:: @ 86160B4
-	.incbin "baserom.gba", 0x6160b4, 0x20
-
-gUnknown_086160D4:: @ 86160D4
-	.incbin "baserom.gba", 0x6160d4, 0x4
-
-gUnknown_086160D8:: @ 86160D8
-	.incbin "baserom.gba", 0x6160d8, 0x1c
-
-gUnknown_086160F4:: @ 86160F4
-	.incbin "baserom.gba", 0x6160f4, 0x4
-
-gUnknown_086160F8:: @ 86160F8
-	.incbin "baserom.gba", 0x6160f8, 0x28
-
-gUnknown_08616120:: @ 8616120
-	.incbin "baserom.gba", 0x616120, 0x4
-
-gUnknown_08616124:: @ 8616124
-	.incbin "baserom.gba", 0x616124, 0x4
-
-	.align 2
-gFont6BrailleGlyphs:: @ 8616128
-	.incbin "data/graphics/fonts/font6.fwjpnfont"
-
-gUnknown_08617128:: @ 8617128
-	.incbin "baserom.gba", 0x617128, 0x48
diff --git a/data/item_icon.s b/data/item_icon.s
new file mode 100644
index 000000000..dac00dc6c
--- /dev/null
+++ b/data/item_icon.s
@@ -0,0 +1,13 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+@ 8614410
+	.include "data/graphics/items/item_icon_table.inc"
+
+@ 8614FE0
+	.incbin "baserom.gba", 0x614fe0, 0x14
+
+gUnknown_08614FF4:: @ 8614FF4
+	.incbin "baserom.gba", 0x614ff4, 0x18
diff --git a/data/item_menu.s b/data/item_menu.s
new file mode 100644
index 000000000..762f10ca4
--- /dev/null
+++ b/data/item_menu.s
@@ -0,0 +1,73 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_08613F90:: @ 8613F90
+	.incbin "baserom.gba", 0x613f90, 0xc
+
+gUnknown_08613F9C:: @ 8613F9C
+	.incbin "baserom.gba", 0x613f9c, 0x18
+
+gUnknown_08613FB4:: @ 8613FB4
+	.incbin "baserom.gba", 0x613fb4, 0x78
+
+gUnknown_0861402C:: @ 861402C
+	.incbin "baserom.gba", 0x61402c, 0x4
+
+gUnknown_08614030:: @ 8614030
+	.incbin "baserom.gba", 0x614030, 0x4
+
+gUnknown_08614034:: @ 8614034
+	.incbin "baserom.gba", 0x614034, 0x4
+
+gUnknown_08614038:: @ 8614038
+	.incbin "baserom.gba", 0x614038, 0x4
+
+gUnknown_0861403C:: @ 861403C
+	.incbin "baserom.gba", 0x61403c, 0x6
+
+gUnknown_08614042:: @ 8614042
+	.incbin "baserom.gba", 0x614042, 0x2
+
+gUnknown_08614044:: @ 8614044
+	.incbin "baserom.gba", 0x614044, 0x2
+
+gUnknown_08614046:: @ 8614046
+	.incbin "baserom.gba", 0x614046, 0x1
+
+gUnknown_08614047:: @ 8614047
+	.incbin "baserom.gba", 0x614047, 0x4
+
+gUnknown_0861404B:: @ 861404B
+	.incbin "baserom.gba", 0x61404b, 0x2
+
+gUnknown_0861404D:: @ 861404D
+	.incbin "baserom.gba", 0x61404d, 0x2
+
+gUnknown_0861404F:: @ 861404F
+	.incbin "baserom.gba", 0x61404f, 0x5
+
+gUnknown_08614054:: @ 8614054
+	.incbin "baserom.gba", 0x614054, 0x30
+
+gUnknown_08614084:: @ 8614084
+	.incbin "baserom.gba", 0x614084, 0x8
+
+gUnknown_0861408C:: @ 861408C
+	.incbin "baserom.gba", 0x61408c, 0x8
+
+gUnknown_08614094:: @ 8614094
+	.incbin "baserom.gba", 0x614094, 0x10
+
+gUnknown_086140A4:: @ 86140A4
+	.incbin "baserom.gba", 0x6140a4, 0xc0
+
+gUnknown_08614164:: @ 8614164
+	.incbin "baserom.gba", 0x614164, 0x10
+
+gUnknown_08614174:: @ 8614174
+	.incbin "baserom.gba", 0x614174, 0x38
+
+gUnknown_086141AC:: @ 86141AC
+	.incbin "baserom.gba", 0x6141ac, 0x50
diff --git a/data/menu_indicators.s b/data/menu_indicators.s
new file mode 100644
index 000000000..ee97261cd
--- /dev/null
+++ b/data/menu_indicators.s
@@ -0,0 +1,49 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_086141FC:: @ 86141FC
+	.incbin "baserom.gba", 0x6141fc, 0x48
+
+gUnknown_08614244:: @ 8614244
+	.incbin "baserom.gba", 0x614244, 0x18
+
+gUnknown_0861425C:: @ 861425C
+	.incbin "baserom.gba", 0x61425c, 0x4
+
+gUnknown_08614260:: @ 8614260
+	.incbin "baserom.gba", 0x614260, 0x4
+
+gUnknown_08614264:: @ 8614264
+	.incbin "baserom.gba", 0x614264, 0x4
+
+gUnknown_08614268:: @ 8614268
+	.incbin "baserom.gba", 0x614268, 0x4
+
+gUnknown_0861426C:: @ 861426C
+	.incbin "baserom.gba", 0x61426c, 0x4
+
+gUnknown_08614270:: @ 8614270
+	.incbin "baserom.gba", 0x614270, 0x4
+
+gUnknown_08614274:: @ 8614274
+	.incbin "baserom.gba", 0x614274, 0x4
+
+gUnknown_08614278:: @ 8614278
+	.incbin "baserom.gba", 0x614278, 0x18
+
+gUnknown_08614290:: @ 8614290
+	.incbin "baserom.gba", 0x614290, 0x18
+
+gUnknown_086142A8:: @ 86142A8
+	.incbin "baserom.gba", 0x6142a8, 0x20
+
+gUnknown_086142C8:: @ 86142C8
+	.incbin "baserom.gba", 0x6142c8, 0x70
+
+gUnknown_08614338:: @ 8614338
+	.incbin "baserom.gba", 0x614338, 0x40
+
+gUnknown_08614378:: @ 8614378
+	.incbin "baserom.gba", 0x614378, 0x44
diff --git a/data/new_menu_helpers.s b/data/new_menu_helpers.s
new file mode 100644
index 000000000..8d4e43b15
--- /dev/null
+++ b/data/new_menu_helpers.s
@@ -0,0 +1,27 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0860F074:: @ 860F074
+	.incbin "baserom.gba", 0x60f074, 0x20
+
+gUnknown_0860F094:: @ 860F094
+	.incbin "baserom.gba", 0x60f094, 0x4
+
+gUnknown_0860F098:: @ 860F098
+	.incbin "baserom.gba", 0x60f098, 0x10
+
+gUnknown_0860F0A8:: @ 860F0A8
+	.incbin "baserom.gba", 0x60f0a8, 0x8
+
+    @ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c.  Regardless, they were plopped here.
+
+gUnknown_0860F0B0:: @ 860F0B0
+	.incbin "baserom.gba", 0x60f0b0, 0x20
+
+gUnknown_0860F0D0:: @ 860F0D0
+	.incbin "baserom.gba", 0x60f0d0, 0x4
+
+gUnknown_0860F0D4:: @ 860F0D4
+	.incbin "baserom.gba", 0x60f0d4, 0x68
diff --git a/data/party_menu.s b/data/party_menu.s
new file mode 100644
index 000000000..36ee4f960
--- /dev/null
+++ b/data/party_menu.s
@@ -0,0 +1,229 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0861500C:: @ 861500C
+	.incbin "baserom.gba", 0x61500c, 0x3c
+
+gUnknown_08615048:: @ 8615048
+	.incbin "baserom.gba", 0x615048, 0x670
+
+gUnknown_086156B8:: @ 86156B8
+	.incbin "baserom.gba", 0x6156b8, 0x2c
+
+gUnknown_086156E4:: @ 86156E4
+	.incbin "baserom.gba", 0x6156e4, 0x20
+
+gUnknown_08615704:: @ 8615704
+	.incbin "baserom.gba", 0x615704, 0xc0
+
+gUnknown_086157C4:: @ 86157C4
+	.incbin "baserom.gba", 0x6157c4, 0x1c
+
+gUnknown_086157E0:: @ 86157E0
+	.incbin "baserom.gba", 0x6157e0, 0x1c
+
+gUnknown_086157FC:: @ 86157FC
+	.incbin "baserom.gba", 0x6157fc, 0x14
+
+gUnknown_08615810:: @ 8615810
+	.incbin "baserom.gba", 0x615810, 0x40
+
+gUnknown_08615850:: @ 8615850
+	.incbin "baserom.gba", 0x615850, 0x40
+
+gUnknown_08615890:: @ 8615890
+	.incbin "baserom.gba", 0x615890, 0x40
+
+gUnknown_086158D0:: @ 86158D0
+	.incbin "baserom.gba", 0x6158d0, 0x38
+
+gUnknown_08615908:: @ 8615908
+	.incbin "baserom.gba", 0x615908, 0x8
+
+gUnknown_08615910:: @ 8615910
+	.incbin "baserom.gba", 0x615910, 0x8
+
+gUnknown_08615918:: @ 8615918
+	.incbin "baserom.gba", 0x615918, 0x8
+
+gUnknown_08615920:: @ 8615920
+	.incbin "baserom.gba", 0x615920, 0x8
+
+gUnknown_08615928:: @ 8615928
+	.incbin "baserom.gba", 0x615928, 0x8
+
+gUnknown_08615930:: @ 8615930
+	.incbin "baserom.gba", 0x615930, 0x8
+
+gUnknown_08615938:: @ 8615938
+	.incbin "baserom.gba", 0x615938, 0x8
+
+gUnknown_08615940:: @ 8615940
+	.incbin "baserom.gba", 0x615940, 0x8
+
+gUnknown_08615948:: @ 8615948
+	.incbin "baserom.gba", 0x615948, 0x8
+
+gUnknown_08615950:: @ 8615950
+	.incbin "baserom.gba", 0x615950, 0x8
+
+gUnknown_08615958:: @ 8615958
+	.incbin "baserom.gba", 0x615958, 0x8
+
+gUnknown_08615960:: @ 8615960
+	.incbin "baserom.gba", 0x615960, 0x8
+
+gUnknown_08615968:: @ 8615968
+	.incbin "baserom.gba", 0x615968, 0x8
+
+gUnknown_08615970:: @ 8615970
+	.incbin "baserom.gba", 0x615970, 0x18
+
+gUnknown_08615988:: @ 8615988
+	.incbin "baserom.gba", 0x615988, 0x46
+
+gUnknown_086159CE:: @ 86159CE
+	.incbin "baserom.gba", 0x6159ce, 0x46
+
+gUnknown_08615A14:: @ 8615A14
+	.incbin "baserom.gba", 0x615a14, 0x36
+
+gUnknown_08615A4A:: @ 8615A4A
+	.incbin "baserom.gba", 0x615a4a, 0x36
+
+gUnknown_08615A80:: @ 8615A80
+	.incbin "baserom.gba", 0x615a80, 0x36
+
+gUnknown_08615AB6:: @ 8615AB6
+	.incbin "baserom.gba", 0x615ab6, 0x2
+
+gUnknown_08615AB8:: @ 8615AB8
+	.incbin "baserom.gba", 0x615ab8, 0x2
+
+gUnknown_08615ABA:: @ 8615ABA
+	.incbin "baserom.gba", 0x615aba, 0x3
+
+gUnknown_08615ABD:: @ 8615ABD
+	.incbin "baserom.gba", 0x615abd, 0x3
+
+gUnknown_08615AC0:: @ 8615AC0
+	.incbin "baserom.gba", 0x615ac0, 0x3
+
+gUnknown_08615AC3:: @ 8615AC3
+	.incbin "baserom.gba", 0x615ac3, 0x2
+
+gUnknown_08615AC5:: @ 8615AC5
+	.incbin "baserom.gba", 0x615ac5, 0x2
+
+gUnknown_08615AC7:: @ 8615AC7
+	.incbin "baserom.gba", 0x615ac7, 0x2
+
+gUnknown_08615AC9:: @ 8615AC9
+	.incbin "baserom.gba", 0x615ac9, 0x2
+
+gUnknown_08615ACB:: @ 8615ACB
+	.incbin "baserom.gba", 0x615acb, 0x2
+
+gUnknown_08615ACD:: @ 8615ACD
+	.incbin "baserom.gba", 0x615acd, 0x3
+
+gUnknown_08615AD0:: @ 8615AD0
+	.incbin "baserom.gba", 0x615ad0, 0x3
+
+gUnknown_08615AD3:: @ 8615AD3
+	.incbin "baserom.gba", 0x615ad3, 0x3
+
+gUnknown_08615AD6:: @ 8615AD6
+	.incbin "baserom.gba", 0x615ad6, 0x3
+
+gUnknown_08615AD9:: @ 8615AD9
+	.incbin "baserom.gba", 0x615ad9, 0x3
+
+gUnknown_08615ADC:: @ 8615ADC
+	.incbin "baserom.gba", 0x615adc, 0x3
+
+gUnknown_08615ADF:: @ 8615ADF
+	.incbin "baserom.gba", 0x615adf, 0x3
+
+gUnknown_08615AE2:: @ 8615AE2
+	.incbin "baserom.gba", 0x615ae2, 0x3
+
+gUnknown_08615AE5:: @ 8615AE5
+	.incbin "baserom.gba", 0x615ae5, 0x3
+
+gUnknown_08615AE8:: @ 8615AE8
+	.incbin "baserom.gba", 0x615ae8, 0x3
+
+gUnknown_08615AEB:: @ 8615AEB
+	.incbin "baserom.gba", 0x615aeb, 0x3
+
+gUnknown_08615AEE:: @ 8615AEE
+	.incbin "baserom.gba", 0x615aee, 0x3
+
+gUnknown_08615AF1:: @ 8615AF1
+	.incbin "baserom.gba", 0x615af1, 0x3
+
+gUnknown_08615AF4:: @ 8615AF4
+	.incbin "baserom.gba", 0x615af4, 0x6c
+
+gUnknown_08615B60:: @ 8615B60
+	.incbin "baserom.gba", 0x615b60, 0xa8
+
+gUnknown_08615C08:: @ 8615C08
+	.incbin "baserom.gba", 0x615c08, 0x130
+
+gUnknown_08615D38:: @ 8615D38
+	.incbin "baserom.gba", 0x615d38, 0x38
+
+gUnknown_08615D70:: @ 8615D70
+	.incbin "baserom.gba", 0x615d70, 0xe
+
+gUnknown_08615D7E:: @ 8615D7E
+	.incbin "baserom.gba", 0x615d7e, 0x1e
+
+gUnknown_08615D9C:: @ 8615D9C
+	.incbin "baserom.gba", 0x615d9c, 0x70
+
+gUnknown_08615E0C:: @ 8615E0C
+	.incbin "baserom.gba", 0x615e0c, 0xa4
+
+gUnknown_08615EB0:: @ 8615EB0
+	.incbin "baserom.gba", 0x615eb0, 0x8
+
+gUnknown_08615EB8:: @ 8615EB8
+	.incbin "baserom.gba", 0x615eb8, 0x8
+
+gUnknown_08615EC0:: @ 8615EC0
+	.incbin "baserom.gba", 0x615ec0, 0x38
+
+gUnknown_08615EF8:: @ 8615EF8
+	.incbin "baserom.gba", 0x615ef8, 0x8
+
+gUnknown_08615F00:: @ 8615F00
+	.incbin "baserom.gba", 0x615f00, 0x8
+
+gUnknown_08615F08:: @ 8615F08
+	.incbin "baserom.gba", 0x615f08, 0x68
+
+gUnknown_08615F70:: @ 8615F70
+	.incbin "baserom.gba", 0x615f70, 0x8
+
+gUnknown_08615F78:: @ 8615F78
+	.incbin "baserom.gba", 0x615f78, 0x80
+
+gUnknown_08615FF8:: @ 8615FF8
+	.incbin "baserom.gba", 0x615ff8, 0x8
+
+gUnknown_08616000:: @ 8616000
+	.incbin "baserom.gba", 0x616000, 0x8
+
+gUnknown_08616008:: @ 8616008
+	.incbin "baserom.gba", 0x616008, 0x18
+
+gUnknown_08616020:: @ 8616020
+	.incbin "baserom.gba", 0x616020, 0x20
+
+gUnknown_08616040:: @ 8616040
+	.incbin "baserom.gba", 0x616040, 0x74
diff --git a/data/save_location.s b/data/save_location.s
new file mode 100644
index 000000000..eabed7d86
--- /dev/null
+++ b/data/save_location.s
@@ -0,0 +1,13 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_086143BC:: @ 86143BC
+	.incbin "baserom.gba", 0x6143bc, 0x4e
+
+gUnknown_0861440A:: @ 861440A
+	.incbin "baserom.gba", 0x61440a, 0x4
+
+gUnknown_0861440E:: @ 861440E
+	.incbin "baserom.gba", 0x61440e, 0x2
diff --git a/data/unk_81BAD84.s b/data/unk_81BAD84.s
new file mode 100644
index 000000000..de88365ac
--- /dev/null
+++ b/data/unk_81BAD84.s
@@ -0,0 +1,7 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_08617128:: @ 8617128
+	.incbin "baserom.gba", 0x617128, 0x48
diff --git a/data/unk_text_util_2.s b/data/unk_text_util_2.s
new file mode 100644
index 000000000..69f227ea2
--- /dev/null
+++ b/data/unk_text_util_2.s
@@ -0,0 +1,11 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_08616124:: @ 8616124
+	.incbin "baserom.gba", 0x616124, 0x4
+
+	.align 2
+gFont6BrailleGlyphs:: @ 8616128
+	.incbin "data/graphics/fonts/font6.fwjpnfont"
diff --git a/ld_script.txt b/ld_script.txt
index 177f36888..e5c5475f7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -380,7 +380,17 @@ SECTIONS {
         data/battle_controller_recorded_player.o(.rodata);
         src/battle_dome_cards.o(.rodata);
         src/lilycove_lady.o(.rodata);
-        data/data_emerald.o(.rodata);
+        data/battle_frontier_1.o(.rodata);
+        data/new_menu_helpers.o(.rodata);
+        data/battle_frontier_2.o(.rodata);
+        data/item_menu.o(.rodata);
+        data/menu_indicators.o(.rodata);
+        data/save_location.o(.rodata);
+        data/item_icon.o(.rodata);
+        data/party_menu.o(.rodata);
+        data/battle_tent.o(.rodata);
+        data/unk_text_util_2.o(.rodata);
+        data/unk_81BAD84.o(.rodata);
         data/battle_controller_player_partner.o(.rodata);
         data/data_emerald2pre1.o(.rodata);
         src/berry_fix_program.o(.rodata);