split file archives

11 files changed, 118 insertions, 35 deletions

diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index 977da38..55fecd6 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -1705,7 +1705,7 @@ _0800C286:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0800C290: .4byte 0x09e8665c
+_0800C290: .4byte gUnknown_9E8665C
 _0800C294: .4byte gUnknown_3000FD8
 	thumb_func_end sub_800C214
 
@@ -1756,7 +1756,7 @@ _0800C2C8:
 	.align 2, 0
 _0800C2F0: .4byte 0x000003e5
 _0800C2F4: .4byte gUnknown_3000FE8
-_0800C2F8: .4byte 0x09e8665c
+_0800C2F8: .4byte gUnknown_9E8665C
 _0800C2FC:
 	adds r0, r5, 0
 	bl sub_800CAAC
@@ -1782,7 +1782,7 @@ _0800C2FC:
 	bl nullsub_21
 	b _0800C3DE
 	.align 2, 0
-_0800C330: .4byte 0x09e8665c
+_0800C330: .4byte gUnknown_9E8665C
 _0800C334: .4byte gUnknown_3000FD8
 _0800C338:
 	bl sub_800B620
@@ -1929,7 +1929,7 @@ _0800C43E:
 	.align 2, 0
 _0800C460: .4byte 0x000003e5
 _0800C464: .4byte gUnknown_3000FE8
-_0800C468: .4byte 0x09e8665c
+_0800C468: .4byte gUnknown_9E8665C
 _0800C46C:
 	ldr r0, [r6]
 	bl sub_80AF7C0
@@ -1989,7 +1989,7 @@ _0800C496:
 	b _0800C4FE
 	.align 2, 0
 _0800C4E4: .4byte gUnknown_3000FD8
-_0800C4E8: .4byte 0x09e8665c
+_0800C4E8: .4byte gUnknown_9E8665C
 _0800C4EC:
 	adds r0, r6, 0
 	bl sub_80AF7C0
@@ -2506,7 +2506,7 @@ _0800C8F0:
 	bl sub_80AFF50
 	b _0800C926
 	.align 2, 0
-_0800C918: .4byte 0x09e8665c
+_0800C918: .4byte gUnknown_9E8665C
 _0800C91C:
 	strh r0, [r4]
 	mov r1, r8
@@ -2762,7 +2762,7 @@ sub_800CAE0:
 	ldrh r0, [r0, 0x4]
 	bx lr
 	.align 2, 0
-_0800CAEC: .4byte 0x09e866bc
+_0800CAEC: .4byte gUnknown_9E866BC
 	thumb_func_end sub_800CAE0
 
 	thumb_func_start sub_800CAF0
@@ -2782,7 +2782,7 @@ sub_800CAF0:
 	movs r0, 0x1
 	b _0800CB12
 	.align 2, 0
-_0800CB0C: .4byte 0x09e8665c
+_0800CB0C: .4byte gUnknown_9E8665C
 _0800CB10:
 	movs r0, 0
 _0800CB12:
@@ -5091,7 +5091,7 @@ _0800DB38: .4byte gUnknown_203B0CC
 _0800DB3C: .4byte 0x00001a18
 _0800DB40: .4byte 0x00001a04
 _0800DB44: .4byte gUnknown_80B9C6C
-_0800DB48: .4byte 0x09740000
+_0800DB48: .4byte gUnknown_9740000
 _0800DB4C:
 	ldr r0, _0800DB74
 	ldr r1, _0800DB78
@@ -5112,7 +5112,7 @@ _0800DB6C:
 	bx r0
 	.align 2, 0
 _0800DB74: .4byte gUnknown_80B9C74
-_0800DB78: .4byte 0x09740000
+_0800DB78: .4byte gUnknown_9740000
 	thumb_func_end sub_800DAC0
 
 	thumb_func_start sub_800DB7C
@@ -8243,7 +8243,7 @@ _0800F1EC:
 	bx r1
 	.align 2, 0
 _0800F1FC: .4byte gUnknown_80CE788
-_0800F200: .4byte 0x09740000
+_0800F200: .4byte gUnknown_9740000
 	thumb_func_end sub_800F1C0
 
 	thumb_func_start sub_800F204
@@ -307966,7 +307966,7 @@ _080A326C:
 	.align 2, 0
 _080A3284: .4byte 0x00000444
 _080A3288: .4byte gUnknown_81188F0
-_080A328C: .4byte 0x09890000
+_080A328C: .4byte gUnknown_9890000
 _080A3290: .4byte 0x00000434
 _080A3294: .4byte 0x00000464
 _080A3298: .4byte 0x00000454
@@ -308087,7 +308087,7 @@ _080A3338:
 _080A3384: .4byte 0x0000046c
 _080A3388: .4byte 0x00000471
 _080A338C: .4byte 0x06008000
-_080A3390: .4byte 0x09890000
+_080A3390: .4byte gUnknown_9890000
 _080A3394:
 	strb r0, [r4]
 	strb r0, [r4, 0x1]
@@ -308175,7 +308175,7 @@ _080A3428:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A3438: .4byte 0x09890000
+_080A3438: .4byte gUnknown_9890000
 _080A343C: .4byte 0x0000052a
 	thumb_func_end sub_80A2FBC
 
@@ -308594,7 +308594,7 @@ _080A376C:
 	.align 2, 0
 _080A377C: .4byte 0x00000444
 _080A3780: .4byte gUnknown_81188F0
-_080A3784: .4byte 0x09890000
+_080A3784: .4byte gUnknown_9890000
 _080A3788: .4byte 0x00000434
 _080A378C: .4byte 0x00000464
 _080A3790: .4byte 0x00000454
@@ -314785,7 +314785,7 @@ _080A6568:
 	bx r0
 	.align 2, 0
 _080A6584: .4byte gUnknown_81178F4
-_080A6588: .4byte 0x09e60000
+_080A6588: .4byte gUnknown_9E60000
 	thumb_func_end sub_80A64A4
 
 	thumb_func_start sub_80A658C
@@ -315734,7 +315734,7 @@ _080A6C42:
 	b _080A6C78
 	.align 2, 0
 _080A6C60: .4byte gUnknown_81178F4
-_080A6C64: .4byte 0x09e60000
+_080A6C64: .4byte gUnknown_9E60000
 _080A6C68: .4byte gUnknown_8117894
 _080A6C6C:
 	mov r1, r10
@@ -317041,7 +317041,7 @@ sub_80A75CC:
 _080A7618: .4byte gUnknown_8117AE4
 _080A761C: .4byte 0xffff0000
 _080A7620: .4byte 0x0000ffff
-_080A7624: .4byte 0x09e60000
+_080A7624: .4byte gUnknown_9E60000
 _080A7628:
 	str r5, [sp, 0x4]
 _080A762A:
@@ -317137,7 +317137,7 @@ sub_80A7688:
 _080A76D4: .4byte gUnknown_8117E8C
 _080A76D8: .4byte 0xffff0000
 _080A76DC: .4byte 0x0000ffff
-_080A76E0: .4byte 0x09e60000
+_080A76E0: .4byte gUnknown_9E60000
 _080A76E4:
 	str r5, [sp, 0x4]
 _080A76E6:
diff --git a/data/dungeon_sbin.s b/data/dungeon_sbin.s
new file mode 100644
index 0000000..cf794bd
--- /dev/null
+++ b/data/dungeon_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_83B0000
+gUnknown_83B0000: @ 83B0000
+	.incbin "baserom.gba", 0x3B0000, 0x151200
diff --git a/data/effect_sbin.s b/data/effect_sbin.s
new file mode 100644
index 0000000..0007944
--- /dev/null
+++ b/data/effect_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_9740000
+gUnknown_9740000: @ 9740000
+	.incbin "baserom.gba", 0x1740000, 0x150000
diff --git a/data/ground_sbin.s b/data/ground_sbin.s
new file mode 100644
index 0000000..727be53
--- /dev/null
+++ b/data/ground_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_9890000
+gUnknown_9890000: @ 9890000
+	.incbin "baserom.gba", 0x1890000, 0x5D0000
diff --git a/data/monster_sbin.s b/data/monster_sbin.s
new file mode 100644
index 0000000..e0737e5
--- /dev/null
+++ b/data/monster_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_8510000
+gUnknown_8510000: @ 8510000
+	.incbin "baserom.gba", 0x510000, 0x1230000
diff --git a/data/ornament_sbin.s b/data/ornament_sbin.s
new file mode 100644
index 0000000..8940b23
--- /dev/null
+++ b/data/ornament_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_9E60000
+gUnknown_9E60000: @ 9E60000
+	.incbin "baserom.gba", 0x1E60000, 0x2665C
diff --git a/data/sound_data.s b/data/sound_data.s
new file mode 100644
index 0000000..043b59a
--- /dev/null
+++ b/data/sound_data.s
@@ -0,0 +1,9 @@
+	.section .rodata
+
+	.global gUnknown_9E8665C
+gUnknown_9E8665C: @ 9E8665C
+	.incbin "baserom.gba", 0x1E8665C, 0x60
+
+	.global gUnknown_9E866BC
+gUnknown_9E866BC: @ 9E866BC
+	.incbin "baserom.gba", 0x1E866BC
diff --git a/data/system_sbin.s b/data/system_sbin.s
new file mode 100644
index 0000000..eb712ee
--- /dev/null
+++ b/data/system_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_8300500
+gUnknown_8300500: @ 8300500
+	.incbin "baserom.gba", 0x300500, 0x72E40
diff --git a/data/titlemenu_sbin.s b/data/titlemenu_sbin.s
new file mode 100644
index 0000000..de9d830
--- /dev/null
+++ b/data/titlemenu_sbin.s
@@ -0,0 +1,5 @@
+	.section .rodata
+
+	.global gUnknown_8380000
+gUnknown_8380000: @ 8380000
+	.incbin "baserom.gba", 0x380000, 0x22E74
diff --git a/data/unk_data.s b/data/unk_data.s
index 7dbe868..a78539e 100644
--- a/data/unk_data.s
+++ b/data/unk_data.s
@@ -1,19 +1,3 @@
 	.section .rodata
 
 	.incbin "baserom.gba", 0x300000, 0x500
-
-	.global gUnknown_8300500
-gUnknown_8300500: @ 8300500
-	.incbin "baserom.gba", 0x300500, 0x7FB00
-
-	.global gUnknown_8380000
-gUnknown_8380000: @ 8380000
-	.incbin "baserom.gba", 0x380000, 0x30000
-
-	.global gUnknown_83B0000
-gUnknown_83B0000: @ 83B0000
-	.incbin "baserom.gba", 0x3B0000, 0x160000
-
-	.global gUnknown_8510000
-gUnknown_8510000: @ 8510000
-	.incbin "baserom.gba", 0x510000
diff --git a/ld_script.txt b/ld_script.txt
index 2f8b921..847e6cc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -90,6 +90,61 @@ SECTIONS {
         data/unk_data.o(.rodata);
     }
 
+    . = 0x8300500;
+    system_sbin_section :
+    ALIGN(4)
+    {
+        data/system_sbin.o(.rodata);
+    }
+
+    . = 0x8380000;
+    titlemenu_sbin_section :
+    ALIGN(4)
+    {
+        data/titlemenu_sbin.o(.rodata);
+    }
+
+    . = 0x83B0000;
+    dungeon_sbin_section :
+    ALIGN(4)
+    {
+        data/dungeon_sbin.o(.rodata);
+    }
+
+    . = 0x8510000;
+    monster_sbin_section :
+    ALIGN(4)
+    {
+        data/monster_sbin.o(.rodata);
+    }
+
+    . = 0x9740000;
+    effect_sbin_section :
+    ALIGN(4)
+    {
+        data/effect_sbin.o(.rodata);
+    }
+
+    . = 0x9890000;
+    ground_sbin_section :
+    ALIGN(4)
+    {
+        data/ground_sbin.o(.rodata);
+    }
+
+    . = 0x9E60000;
+    ornament_sbin_section :
+    ALIGN(4)
+    {
+        data/ornament_sbin.o(.rodata);
+    }
+
+    sound_data :
+    ALIGN(4)
+    {
+        data/sound_data.o(.rodata);
+    }
+
     /* DWARF 2 sections */
     .debug_aranges  0 : { *(.debug_aranges) }
     .debug_pubnames 0 : { *(.debug_pubnames) }