Merge branch 'master' into slot_machine

2 files changed, 8 insertions, 123 deletions

diff --git a/data/data_83F5738.s b/data/data_83F5738.s
index a466ffd45..dc09b0532 100644
--- a/data/data_83F5738.s
+++ b/data/data_83F5738.s
@@ -133,128 +133,7 @@ gUnknown_83F846D:: @ 83F846D
 gUnknown_83F847D:: @ 83F847D
 	.incbin "baserom.gba", 0x3F847D, 0x323
 
-gUnknown_83F87A0:: @ 83F87A0
-	.incbin "baserom.gba", 0x3F87A0, 0x580
-
-gUnknown_83F8D20:: @ 83F8D20
-	.incbin "baserom.gba", 0x3F8D20, 0x240
-
-gUnknown_83F8F60:: @ 83F8F60
-	.incbin "baserom.gba", 0x3F8F60, 0x11E0
-
-gUnknown_83FA140:: @ 83FA140
-	.incbin "baserom.gba", 0x3FA140, 0x1E0
-
-gUnknown_83FA320:: @ 83FA320
-	.incbin "baserom.gba", 0x3FA320, 0x48
-
-gUnknown_83FA368:: @ 83FA368
-	.incbin "baserom.gba", 0x3FA368, 0x48
-
-gUnknown_83FA3B0:: @ 83FA3B0
-	.incbin "baserom.gba", 0x3FA3B0, 0x10
-
-gUnknown_83FA3C0:: @ 83FA3C0
-	.incbin "baserom.gba", 0x3FA3C0, 0xC
-
-gUnknown_83FA3CC:: @ 83FA3CC
-	.incbin "baserom.gba", 0x3FA3CC, 0x8
-
-gUnknown_83FA3D4:: @ 83FA3D4
-	.incbin "baserom.gba", 0x3FA3D4, 0x8
-
-gUnknown_83FA3DC:: @ 83FA3DC
-	.incbin "baserom.gba", 0x3FA3DC, 0x18
-
-gUnknown_83FA3F4:: @ 83FA3F4
-	.incbin "baserom.gba", 0x3FA3F4, 0xC
-
-gUnknown_83FA400:: @ 83FA400
-	.incbin "baserom.gba", 0x3FA400, 0x4
-
-gUnknown_83FA404:: @ 83FA404
-	.incbin "baserom.gba", 0x3FA404, 0xA
-
-gUnknown_83FA40E:: @ 83FA40E
-	.incbin "baserom.gba", 0x3FA40E, 0x6
-
-gUnknown_83FA414:: @ 83FA414
-	.incbin "baserom.gba", 0x3FA414, 0x1C
-
-gUnknown_83FA430:: @ 83FA430
-	.incbin "baserom.gba", 0x3FA430, 0x8
-
-gUnknown_83FA438:: @ 83FA438
-	.incbin "baserom.gba", 0x3FA438, 0xC
-
-gUnknown_83FA444:: @ 83FA444
-	.incbin "baserom.gba", 0x3FA444, 0x20
-
-gUnknown_83FA464:: @ 83FA464
-	.incbin "baserom.gba", 0x3FA464, 0x8
-
-gUnknown_83FA46C:: @ 83FA46C
-	.incbin "baserom.gba", 0x3FA46C, 0x28
-
-gUnknown_83FA494:: @ 83FA494
-	.incbin "baserom.gba", 0x3FA494, 0x6
-
-gUnknown_83FA49A:: @ 83FA49A
-	.incbin "baserom.gba", 0x3FA49A, 0x14
-
-gUnknown_83FA4AE:: @ 83FA4AE
-	.incbin "baserom.gba", 0x3FA4AE, 0x16
-
-gUnknown_83FA4C4:: @ 83FA4C4
-	.incbin "baserom.gba", 0x3FA4C4, 0x1C
-
-gUnknown_83FA4E0:: @ 83FA4E0
-	.incbin "baserom.gba", 0x3FA4E0, 0x4
-
-gUnknown_83FA4E4:: @ 83FA4E4
-	.incbin "baserom.gba", 0x3FA4E4, 0x4
-
-gUnknown_83FA4E8:: @ 83FA4E8
-	.incbin "baserom.gba", 0x3FA4E8, 0xC
-
-gUnknown_83FA4F4:: @ 83FA4F4
-	.incbin "baserom.gba", 0x3FA4F4, 0x14
-
-gUnknown_83FA508:: @ 83FA508
-	.incbin "baserom.gba", 0x3FA508, 0xC
-
-gUnknown_83FA514:: @ 83FA514
-	.incbin "baserom.gba", 0x3FA514, 0xC
-
-gUnknown_83FA520:: @ 83FA520
-	.incbin "baserom.gba", 0x3FA520, 0x14
-
-gUnknown_83FA534:: @ 83FA534
-	.incbin "baserom.gba", 0x3FA534, 0x46
-
-gUnknown_83FA57A:: @ 83FA57A
-	.incbin "baserom.gba", 0x3FA57A, 0xE
-
-gUnknown_83FA588:: @ 83FA588
-	.incbin "baserom.gba", 0x3FA588, 0x44
-
-gUnknown_83FA5CC:: @ 83FA5CC
-	.incbin "baserom.gba", 0x3FA5CC, 0x6C
-
-gUnknown_83FA638:: @ 83FA638
-	.incbin "baserom.gba", 0x3FA638, 0x108
-
-gUnknown_83FA740:: @ 83FA740
-	.incbin "baserom.gba", 0x3FA740, 0x14
-
-gUnknown_83FA754:: @ 83FA754
-	.incbin "baserom.gba", 0x3FA754, 0x30
-
-gUnknown_83FA784:: @ 83FA784
-	.incbin "baserom.gba", 0x3FA784, 0x4B0
-
-gUnknown_83FAC34:: @ 83FAC34
-	.incbin "baserom.gba", 0x3FAC34, 0x500
+	.section .rodata.83FB134
 
 gUnknown_83FB134:: @ 83FB134
 	.incbin "baserom.gba", 0x3FB134, 0xA80
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
index d12de7aa9..72d20cd4e 100644
--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010
 	.incbin "baserom.gba", 0x3A0010, 0x3688
 
 gUnknown_83A3698:: @ 83A3698
-	.incbin "baserom.gba", 0x3A3698, 0x1AC0
+	.incbin "baserom.gba", 0x3A3698, 0x80
+
+gEventObjectBaseOam_32x32:: @ 83A3718
+	.incbin "baserom.gba", 0x3A3718, 0x8
+
+gUnknown_83A3720:: @ 83A3720
+	.incbin "baserom.gba", 0x3A3720, 0x1a38
 
 gUnknown_83A5158:: @ 83A5158
 	.incbin "baserom.gba", 0x3A5158, 0xB0