diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-08 19:00:01 -0400 |
| commit | 2e0259fceb54edb68df7e7956418f3bbbe8c08da (patch) | |
| tree | 3598721e4aea16456820b3ef189ccd6f94607c46 /ld_script.txt | |
| parent | 0335914719ef86def6999d50eefd8a342d696a6e (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4c922d3a0..e1afe8856 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -58,7 +58,6 @@ SECTIONS { asm/blit.o(.text); src/window_8bpp.o(.text); src/text.o(.text); - asm/text.o(.text); src/sprite.o(.text); src/string_util.o(.text); asm/link.o(.text); @@ -251,7 +250,7 @@ SECTIONS { asm/mevent.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); - asm/menews_jisan.o(.text); + src/menews_jisan.o(.text); asm/seagallop.o(.text); asm/unk_8147500.o(.text); asm/unk_8147AA8.o(.text); @@ -365,7 +364,6 @@ SECTIONS { src/text_printer.o(.rodata); src/window.o(.rodata); src/text.o(.rodata); - data/text.o(.rodata); src/sprite.o(.rodata); src/bg_regs.o(.rodata); src/string_util.o(.rodata); @@ -374,6 +372,8 @@ SECTIONS { data/data_84827AC.o(.rodata); src/vs_seeker.o(.rodata); data/data_84827AC.o(.rodata.8453F6C); + src/menews_jisan.o(.rodata); + data/data_84827AC.o(.rodata.8468C98); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 |