diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
| commit | bf5ee99db06cbd805058cc4c2f0fcb4ccf9506da (patch) | |
| tree | 5d55b2504c4ebc3d0108b4eb9c495e189fc485cb /ld_script.txt | |
| parent | 175d4724a33bbb34e1a5ee609584a45ab9685058 (diff) | |
| parent | db6818ca9149304463e5e2219ec90993a3af53b2 (diff) | |
Merge branch 'field_effect'
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index f2b41b9fb..d7f3d3637 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -134,7 +134,6 @@ SECTIONS { src/trainer_see.o(.text); src/wild_encounter.o(.text); src/field_effect.o(.text); - asm/field_effect.o(.text); asm/unknown_task.o(.text); asm/pokemon_menu.o(.text); src/option_menu.o(.text); |