split data out of data2.s

This commit is contained in:
YamaArashi 2016-09-03 09:25:58 -07:00
parent e215a4b6c5
commit 8399f0af6b
7 changed files with 98 additions and 70 deletions

View File

@ -65,7 +65,9 @@ asm/libc.o
DATA_ASM_OBJS := data/data1.o data/data2.o data/anim_mon_front_pics.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/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) OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS)

View File

@ -12255,72 +12255,3 @@ gUnknown_08674C31:: @ 8674C31
gUnknown_08674C86:: @ 8674C86 gUnknown_08674C86:: @ 8674C86
.incbin "base_emerald.gba", 0x674c86, 0xd5a .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

View File

@ -0,0 +1,4 @@
.section .rodata
gUnknown_089A30D0:: @ 89A30D0
.incbin "base_emerald.gba", 0x9a30d0, 0x118

16
data/librtc_rodata.s Normal file
View File

@ -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

37
data/m4a_tables.s Normal file
View File

@ -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

34
data/sound_data.s Normal file
View File

@ -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

View File

@ -86,11 +86,15 @@ SECTIONS {
ALIGN(4) ALIGN(4)
{ {
data/data2.o(.rodata); data/data2.o(.rodata);
data/m4a_tables.o(.rodata);
data/sound_data.o(.rodata);
} =0 } =0
lib_rodata : lib_rodata :
ALIGN(4) ALIGN(4)
{ {
data/libagbbackup_rodata.o(.rodata);
data/librtc_rodata.o(.rodata);
data/librfu_rodata.o(.rodata); data/librfu_rodata.o(.rodata);
tools/agbcc/lib/libgcc.a:_divdi3.o(.rodata); tools/agbcc/lib/libgcc.a:_divdi3.o(.rodata);
tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata); tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);