diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-18 20:23:32 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-18 20:23:32 -0500 |
| commit | f7df299be8dea5fb536cfef6b8ddc30bb760426f (patch) | |
| tree | 70c0b766df1b8ce8817a710b61b60283fec7fec5 /ld_script.txt | |
| parent | 15a7b1bc08f89aebae9b52c2047c0d73dc0f0fb0 (diff) | |
| parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 20750c97d..a37f283d6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -225,7 +225,8 @@ SECTIONS { src/battle_anim_sound_tasks.o(.text); src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); - asm/battle_anim_815A0D4.o(.text); + src/battle_anim_effects_3.o(.text); + asm/battle_anim_effects_3.o(.text); src/learn_move.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); @@ -539,7 +540,7 @@ SECTIONS { data/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); src/battle_controller_safari.o(.rodata); - data/battle_anim_815A0D4.o(.rodata); + src/battle_anim_effects_3.o(.rodata); src/learn_move.o(.rodata); src/roamer.o(.rodata); src/battle_tower.o(.rodata); |