diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-20 22:00:41 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-20 22:00:41 -0800 |
| commit | 38f3f5cc552be4f0a9211db384bd8cf50505b860 (patch) | |
| tree | 4ee76da88be0a033af9d0c8bdcfd3fbfcf49c87a | |
| parent | 9f9e3529f8d5fa6a5847ead54a9f2c8792f3ccd9 (diff) | |
get rid of SUBALIGN
| -rw-r--r-- | data/data.s | 1 | ||||
| -rw-r--r-- | ld_script.txt | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/data/data.s b/data/data.s index c73a5be8b..b0a6f0183 100644 --- a/data/data.s +++ b/data/data.s @@ -1,5 +1,6 @@ .section .rodata + .align 2 gUnknown_8231EC4:: @ 8231EC4 .incbin "baserom.gba", 0x231EC4, 0x20 diff --git a/ld_script.txt b/ld_script.txt index 8e65050bd..2b0e94aab 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -7,7 +7,7 @@ SECTIONS { . = 0x2000000; ewram (NOLOAD) : - SUBALIGN(4) + ALIGN(4) { gHeap = .; @@ -59,7 +59,7 @@ SECTIONS { . = 0x3000000; iwram (NOLOAD) : - SUBALIGN(4) + ALIGN(4) { /* .bss starts at 0x3000000 */ <BSS> @@ -79,7 +79,7 @@ SECTIONS { . = 0x8000000; .text : - SUBALIGN(4) + ALIGN(4) { asm/crt0.o(.text); src/main.o(.text); @@ -311,7 +311,7 @@ SECTIONS { } =0 script_data : - SUBALIGN(4) + ALIGN(4) { data/event_scripts.o(script_data); data/battle_anim_scripts.o(script_data); @@ -323,7 +323,7 @@ SECTIONS { } =0 lib_text : - SUBALIGN(4) + ALIGN(4) { asm/libgcnmultiboot.o(.text); asm/m4a_1.o(.text); @@ -391,7 +391,7 @@ SECTIONS { } =0 .rodata : - SUBALIGN(4) + ALIGN(4) { src/main.o(.rodata); src/bg.o(.rodata); @@ -409,7 +409,7 @@ SECTIONS { } =0 lib_rodata : - SUBALIGN(4) + ALIGN(4) { src/agb_flash.o(.rodata); src/agb_flash_1m.o(.rodata); @@ -461,7 +461,7 @@ SECTIONS { } =0 other_data : - SUBALIGN(4) + ALIGN(4) { data/unknown_serial_data.o(.rodata); data/multiboot_berry_glitch_fix.o(.rodata); @@ -471,7 +471,7 @@ SECTIONS { . = 0x8D00000; gfx_data : - SUBALIGN(4) + ALIGN(4) { data/graphics.o(gfx_data); } =0 |