diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-23 15:02:32 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-23 15:02:32 -0400 |
| commit | d740eabb3c19bae406d184c6f29c81b2c5dc952f (patch) | |
| tree | d3641957151d385b2ddaeb4c944da3cef54583f2 /ld_script.txt | |
| parent | 57543e164e0ed15c23e295ffa08e5804d4d32037 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index e973a7748..4b2e1e34a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -80,7 +80,7 @@ SECTIONS { src/util.o(.text); src/blend_palette.o(.text); asm/daycare.o(.text); - asm/egg_hatch.o(.text); + src/egg_hatch.o(.text); asm/battle_interface.o(.text); asm/smokescreen.o(.text); asm/pokeball.o(.text); @@ -339,8 +339,10 @@ SECTIONS { src/trig.o(.rodata); src/util.o(.rodata); data/data3.o(.rodata); + src/egg_hatch.o(.rodata); + data/data3_a0_A.o(.rodata); data/field_map_obj.o(.rodata); - data/data3.o(.rodata_b); + data/data3_a0_B.o(.rodata); src/berry.o(.rodata); data/data3_a1.o(.rodata); src/pokemon_size_record.o(.rodata) |