diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-11 12:49:51 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-11 12:49:51 -0600 |
commit | 253bc8fa35d0f720f41f609b19e5e38e68d1b10f (patch) | |
tree | 9c6aebf0b802da1988ee9ac160071c348f749f20 /ld_script.txt | |
parent | a7fe23e3434f427995595b6747ac0f3e57b94621 (diff) | |
parent | 4ffcd640b3c7962ba918b544a5a7474198e1e029 (diff) |
Merge branch 'master' into makefile
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index 373924638..b668449e4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -295,7 +295,8 @@ SECTIONS { src/battle/anim/bug.o(.text); asm/rock.o(.text); asm/ghost.o(.text); - asm/dragon.o(.text); + src/battle/anim/dragon.o(.text); + src/battle/anim/dark.o(.text); asm/dark.o(.text); asm/ground.o(.text); asm/normal.o(.text); |