diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2020-10-20 13:08:42 -0500 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2020-10-20 13:08:42 -0500 |
commit | 0271952426117ba1c95b2f4156a8b555104bfa1c (patch) | |
tree | e400c95ab03b48368ae36f13711ecb1c0ca56d5d /ld_script.txt | |
parent | a0aac0e9d22251550fc01bc899d3144639072d3e (diff) | |
parent | 8834fdd3e24e7904973af4ca160c1badbf5bb31a (diff) |
Merge remote-tracking branch 'nullablevoid/master' into master
Port m4a from pokeemerald into pmd-red
Diffstat (limited to 'ld_script.txt')
-rwxr-xr-x | ld_script.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 911c42e..6f44f1b 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -120,9 +120,7 @@ SECTIONS { src/code_80A7714.o(.text); asm/code_80A7714.o(.text); asm/m4a_1.o(.text); - src/m4a_2.o(.text); - asm/m4a_3.o(.text); - src/m4a_4.o(.text); + src/m4a.o(.text); *libagbsyscall.a:CpuSet.o(.text); *libagbsyscall.a:SoundBiasReset.o(.text); *libagbsyscall.a:SoundBiasSet.o(.text); |