diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
| commit | 690021476f3ec334e06b0dfc95267114949ecfc7 (patch) | |
| tree | d06cd3f1d45ed0e957f3bede6c0955f1375877c4 /ld_script.txt | |
| parent | 8d658666a14f8364df32d3f14c6923ebe194153e (diff) | |
| parent | d4afe49b06a7ef2422839fcd0340c06c6a8e541b (diff) | |
conflict fix
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index acc368cc8..0fe09e652 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -119,7 +119,7 @@ SECTIONS { src/field/trainer_see.o(.text); src/field/wild_encounter.o(.text); src/field/field_effect.o(.text); - src/unknown_task.o(.text); + src/scanline_effect.o(.text); src/pokemon/pokemon_menu.o(.text); src/engine/option_menu.o(.text); src/pokemon/pokedex.o(.text); @@ -282,17 +282,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); src/battle/anim/dragon.o(.text); |