diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
| commit | 399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch) | |
| tree | 4805fda152bee21eb8bfb96f70f33e5f958c06b2 /ld_script.txt | |
| parent | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff) | |
| parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index 306a1f4b0..eaf75c3de 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -147,7 +147,6 @@ SECTIONS { src/secret_base.o(.text); src/tv.o(.text); src/contest_link_80F57C4.o(.text); - asm/contest_link_80F57C4.o(.text); src/script_pokemon_util_80F87D8.o(.text); src/field_poison.o(.text); src/pokemon_size_record.o(.text); @@ -165,6 +164,7 @@ SECTIONS { src/ice.o(.text); src/fight.o(.text); src/poison.o(.text); + src/flying.o(.text); asm/flying.o(.text); src/psychic.o(.text); src/bug.o(.text); @@ -289,6 +289,7 @@ SECTIONS { src/pokemon_summary_screen.o(.text); src/unk_pokedex_area_screen_helper.o(.text); src/battle_pyramid_bag.o(.text); + src/pokenav.o(.text); asm/pokenav.o(.text); src/pokenav_match_call.o(.text); asm/rom_81D1C44.o(.text); @@ -591,6 +592,7 @@ SECTIONS { src/pokemon_summary_screen.o(.rodata); src/unk_pokedex_area_screen_helper.o(.rodata); src/battle_pyramid_bag.o(.rodata); + src/pokenav.o(.rodata); data/pokenav.o(.rodata); src/pokenav_match_call.o(.rodata); data/rom_81D1C44.o(.rodata); |