diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-04 14:54:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 14:54:12 -0800 |
| commit | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (patch) | |
| tree | 72a7336f28db1d64f74da1232b0c24b34e022516 /ld_script.txt | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
| parent | ff1a79f2fcc111360fe0ce478fdd24cfcdf93932 (diff) | |
Merge pull request #505 from progreon/master
Decompiled fire.s and fire_2.s
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 62a7bf680..6d35da842 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -278,9 +278,9 @@ SECTIONS { src/battle/anim/energy_wave.o(.text); src/battle/anim/water.o(.text); asm/water.o(.text); - asm/fire.o(.text); + src/battle/anim/fire.o(.text); src/battle/anim/sunlight.o(.text); - asm/fire_2.o(.text); + 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); |