diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-29 19:45:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 19:45:56 -0700 |
| commit | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (patch) | |
| tree | f830e2568cdd61baa849ad860ee875093d3095af /ld_script.txt | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
| parent | 4133688019e167da45c868a26bf6a6e4901bef54 (diff) | |
Merge pull request #426 from PikalaxALT/daycare
Decompile asm/daycare.s
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7648f98c7..f93bcbedb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -71,7 +71,6 @@ SECTIONS { src/util.o(.text); src/blend_palette.o(.text); src/daycare.o(.text); - asm/daycare.o(.text); src/egg_hatch.o(.text); src/battle_interface.o(.text); src/smokescreen.o(.text); @@ -334,7 +333,7 @@ SECTIONS { . = ALIGN(4); src/trig.o(.rodata); src/util.o(.rodata); - data/daycare.o(.rodata); + src/daycare.o(.rodata); src/egg_hatch.o(.rodata); data/battle_interface.o(.rodata); src/pokeball.o(.rodata); |