summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-06-26 00:01:17 -0400
committerGitHub <noreply@github.com>2018-06-26 00:01:17 -0400
commit1cada74444df875649b239ed488c6ee4deb8a7f1 (patch)
tree0cd68b160fa8d4a27cd65d6ffa80159b231f715c /ld_script.txt
parentb3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff)
parentfa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff)
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt
index dbecbe3f1..9ccf09013 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -160,6 +160,7 @@ SECTIONS {
src/debug/sound_check_menu.o(.text);
src/secret_base.o(.text);
src/tv.o(.text);
+ src/battle/contest_link_80C2020.o(.text);
asm/contest_link_80C2020.o(.text);
src/script_pokemon_util_80C4BF0.o(.text);
src/field_poison.o(.text);
@@ -293,7 +294,6 @@ SECTIONS {
src/battle/anim/dragon.o(.text);
src/battle/anim/dark.o(.text);
src/battle/anim/ground.o(.text);
- asm/ground.o(.text);
src/battle/anim/normal.o(.text);
asm/normal.o(.text);
src/battle/anim/battle_intro.o(.text);
@@ -585,7 +585,7 @@ SECTIONS {
src/debug/sound_check_menu.o(.rodata);
src/secret_base.o(.rodata);
src/tv.o(.rodata);
- data/contest_link_80C2020.o(.rodata);
+ src/battle/contest_link_80C2020.o(.rodata);
src/pokemon_size_record.o(.rodata);
src/pc_screen_effect.o(.rodata);
src/pc_screen_effect.o(.data);