summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--data/data2.s69
-rw-r--r--data/libagbbackup_rodata.s4
-rw-r--r--data/librtc_rodata.s16
-rw-r--r--data/m4a_tables.s37
-rw-r--r--data/sound_data.s34
-rw-r--r--ld_script.txt4
7 files changed, 98 insertions, 70 deletions
diff --git a/Makefile b/Makefile
index 4123e4ddc..66a80d3c5 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,9 @@ asm/libc.o
DATA_ASM_OBJS := data/data1.o data/data2.o data/anim_mon_front_pics.o \
data/graphics.o data/unknown_serial_data.o data/multiboot_berry_glitch_fix.o \
-data/multiboot_pokemon_colosseum.o data/librfu_rodata.o
+data/multiboot_pokemon_colosseum.o data/libagbbackup_rodata.o \
+data/librtc_rodata.o data/librfu_rodata.o data/sound_data.o \
+data/m4a_tables.o
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS)
diff --git a/data/data2.s b/data/data2.s
index fc9fba203..98890a737 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -12255,72 +12255,3 @@ gUnknown_08674C31:: @ 8674C31
gUnknown_08674C86:: @ 8674C86
.incbin "base_emerald.gba", 0x674c86, 0xd5a
-
-gUnknown_086759E0:: @ 86759E0
- .incbin "base_emerald.gba", 0x6759e0, 0x90
-
-gUnknown_08675A70:: @ 8675A70
- .incbin "base_emerald.gba", 0x675a70, 0x10
-
-gUnknown_08675A80:: @ 8675A80
- .incbin "base_emerald.gba", 0x675a80, 0xb4
-
-gUnknown_08675B34:: @ 8675B34
- .incbin "base_emerald.gba", 0x675b34, 0x30
-
-gUnknown_08675B64:: @ 8675B64
- .incbin "base_emerald.gba", 0x675b64, 0x18
-
-gUnknown_08675B7C:: @ 8675B7C
- .incbin "base_emerald.gba", 0x675b7c, 0x84
-
-gUnknown_08675C00:: @ 8675C00
- .incbin "base_emerald.gba", 0x675c00, 0x18
-
-gUnknown_08675C18:: @ 8675C18
- .incbin "base_emerald.gba", 0x675c18, 0x3c
-
-gUnknown_08675C54:: @ 8675C54
- .incbin "base_emerald.gba", 0x675c54, 0x10
-
-gUnknown_08675C64:: @ 8675C64
- .incbin "base_emerald.gba", 0x675c64, 0x34
-
-gUnknown_08675C98:: @ 8675C98
- .incbin "base_emerald.gba", 0x675c98, 0x34
-
-gUnknown_08675CCC:: @ 8675CCC
- .incbin "base_emerald.gba", 0x675ccc, 0x28028
-
-gUnknown_0869DCF4:: @ 869DCF4
- .incbin "base_emerald.gba", 0x69dcf4, 0x600
-
-gUnknown_0869E2F4:: @ 869E2F4
- .incbin "base_emerald.gba", 0x69e2f4, 0x600
-
-gUnknown_0869E8F4:: @ 869E8F4
- .incbin "base_emerald.gba", 0x69e8f4, 0x600
-
-gUnknown_0869EEF4:: @ 869EEF4
- .incbin "base_emerald.gba", 0x69eef4, 0x30
-
-gUnknown_0869EF24:: @ 869EF24
- .incbin "base_emerald.gba", 0x69ef24, 0x600
-
-gUnknown_0869F524:: @ 869F524
- .incbin "base_emerald.gba", 0x69f524, 0x600
-
-gUnknown_0869FB24:: @ 869FB24
- .incbin "base_emerald.gba", 0x69fb24, 0x600
-
-gUnknown_086A0124:: @ 86A0124
- .incbin "base_emerald.gba", 0x6a0124, 0x1489c
-
-gUnknown_086B49C0:: @ 86B49C0
- .incbin "base_emerald.gba", 0x6b49c0, 0x30
-
-gUnknown_086B49F0:: @ 86B49F0
- .incbin "base_emerald.gba", 0x6b49f0, 0x2ee6e0
-
-gUnknown_089A30D0:: @ 89A30D0
- .incbin "base_emerald.gba", 0x9a30d0, 0x150
diff --git a/data/libagbbackup_rodata.s b/data/libagbbackup_rodata.s
new file mode 100644
index 000000000..f6ca3e80d
--- /dev/null
+++ b/data/libagbbackup_rodata.s
@@ -0,0 +1,4 @@
+ .section .rodata
+
+gUnknown_089A30D0:: @ 89A30D0
+ .incbin "base_emerald.gba", 0x9a30d0, 0x118
diff --git a/data/librtc_rodata.s b/data/librtc_rodata.s
new file mode 100644
index 000000000..30cc8427f
--- /dev/null
+++ b/data/librtc_rodata.s
@@ -0,0 +1,16 @@
+ .section .rodata
+
+ .asciz "SIIRTC_V001"
+
+ .align 2
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x3001A7E
+ .4byte 0x80000C6
diff --git a/data/m4a_tables.s b/data/m4a_tables.s
new file mode 100644
index 000000000..7433189d5
--- /dev/null
+++ b/data/m4a_tables.s
@@ -0,0 +1,37 @@
+ .section .rodata
+
+gUnknown_086759E0:: @ 86759E0
+ .incbin "base_emerald.gba", 0x6759e0, 0x90
+
+gUnknown_08675A70:: @ 8675A70
+ .incbin "base_emerald.gba", 0x675a70, 0x10
+
+gUnknown_08675A80:: @ 8675A80
+ .incbin "base_emerald.gba", 0x675a80, 0xb4
+
+gUnknown_08675B34:: @ 8675B34
+ .incbin "base_emerald.gba", 0x675b34, 0x30
+
+gUnknown_08675B64:: @ 8675B64
+ .incbin "base_emerald.gba", 0x675b64, 0x18
+
+gUnknown_08675B7C:: @ 8675B7C
+ .incbin "base_emerald.gba", 0x675b7c, 0x84
+
+gUnknown_08675C00:: @ 8675C00
+ .incbin "base_emerald.gba", 0x675c00, 0x18
+
+gUnknown_08675C18:: @ 8675C18
+ .incbin "base_emerald.gba", 0x675c18, 0x3c
+
+gUnknown_08675C54:: @ 8675C54
+ .incbin "base_emerald.gba", 0x675c54, 0x10
+
+gUnknown_08675C64:: @ 8675C64
+ .incbin "base_emerald.gba", 0x675c64, 0x34
+
+gUnknown_08675C98:: @ 8675C98
+ .incbin "base_emerald.gba", 0x675c98, 0x34
+
+gUnknown_08675CCC:: @ 8675CCC
+ .incbin "base_emerald.gba", 0x675ccc, 0x38
diff --git a/data/sound_data.s b/data/sound_data.s
new file mode 100644
index 000000000..dbabfcbd1
--- /dev/null
+++ b/data/sound_data.s
@@ -0,0 +1,34 @@
+ .section .rodata
+
+gUnknown_08675D04:: @ 8675D04
+ .incbin "base_emerald.gba", 0x675D04, 0x27FF0
+
+gUnknown_0869DCF4:: @ 869DCF4
+ .incbin "base_emerald.gba", 0x69dcf4, 0x600
+
+gUnknown_0869E2F4:: @ 869E2F4
+ .incbin "base_emerald.gba", 0x69e2f4, 0x600
+
+gUnknown_0869E8F4:: @ 869E8F4
+ .incbin "base_emerald.gba", 0x69e8f4, 0x600
+
+gUnknown_0869EEF4:: @ 869EEF4
+ .incbin "base_emerald.gba", 0x69eef4, 0x30
+
+gUnknown_0869EF24:: @ 869EF24
+ .incbin "base_emerald.gba", 0x69ef24, 0x600
+
+gUnknown_0869F524:: @ 869F524
+ .incbin "base_emerald.gba", 0x69f524, 0x600
+
+gUnknown_0869FB24:: @ 869FB24
+ .incbin "base_emerald.gba", 0x69fb24, 0x600
+
+gUnknown_086A0124:: @ 86A0124
+ .incbin "base_emerald.gba", 0x6a0124, 0x1489c
+
+gUnknown_086B49C0:: @ 86B49C0
+ .incbin "base_emerald.gba", 0x6b49c0, 0x30
+
+gUnknown_086B49F0:: @ 86B49F0
+ .incbin "base_emerald.gba", 0x6b49f0, 0x2ee6e0
diff --git a/ld_script.txt b/ld_script.txt
index 2de99e05a..3914fe005 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -86,11 +86,15 @@ SECTIONS {
ALIGN(4)
{
data/data2.o(.rodata);
+ data/m4a_tables.o(.rodata);
+ data/sound_data.o(.rodata);
} =0
lib_rodata :
ALIGN(4)
{
+ data/libagbbackup_rodata.o(.rodata);
+ data/librtc_rodata.o(.rodata);
data/librfu_rodata.o(.rodata);
tools/agbcc/lib/libgcc.a:_divdi3.o(.rodata);
tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);