diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
| commit | 72bb0daccbdcc4db701d05c10c8b968fe7b09c2a (patch) | |
| tree | c80c40148daa9b92dd39ba6a765b61c4fbf7214d /ld_script.txt | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index eaf75c3de..acfd535f8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -178,7 +178,6 @@ SECTIONS { src/battle_intro.o(.text); src/bike.o(.text); src/easy_chat.o(.text); - asm/easy_chat.o(.text); src/mon_markings.o(.text); src/mauville_old_man.o(.text); src/mail.o(.text); @@ -501,7 +500,7 @@ SECTIONS { src/battle_anim_utility_funcs.o(.rodata); src/battle_intro.o(.rodata); src/bike.o(.rodata); - data/easy_chat.o(.rodata); + src/easy_chat.o(.rodata); src/mon_markings.o(.rodata); src/mauville_old_man.o(.rodata); src/mail.o(.rodata); |