diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-09 20:01:37 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-09 20:01:37 -0500 |
| commit | d7914db5fdc66b2ae86c22064825e0152cb42e72 (patch) | |
| tree | 848ec335c3b7887935503139a141c601c742b9d7 /ld_script.txt | |
| parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
| parent | 78a7c57aa515fefdb498e6398d4604f04ac46db0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 6ae35f8df..e5790fece 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -283,17 +283,17 @@ SECTIONS { src/battle/anim/fire_2.o(.text); src/battle/anim/heated_rock.o(.text); src/battle/anim/wisp_orb.o(.text); - asm/wisp_fire.o(.text); + src/battle/anim/wisp_fire.o(.text); src/battle/anim/thunder.o(.text); src/battle/anim/beta_beat_up.o(.text); src/battle/anim/shock.o(.text); asm/current.o(.text); asm/ice.o(.text); asm/fight.o(.text); - asm/poison.o(.text); + src/battle/anim/poison.o(.text); asm/flying.o(.text); asm/psychic.o(.text); - asm/bug.o(.text); + src/battle/anim/bug.o(.text); asm/rock.o(.text); asm/ghost.o(.text); asm/dragon.o(.text); |
