diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
| commit | 5adf807274aa36dc8f65a120f61debf5a0c1d360 (patch) | |
| tree | c7ea8d26ae569724e24f93687bd0e7d3bf22f95b /ld_script.txt | |
| parent | 06f5a396016aee2406749633b627bb9d729744ff (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge remote-tracking branch 'origin/master' into use_pokeblock
Diffstat (limited to 'ld_script.txt')
| -rwxr-xr-x | ld_script.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index 56dfef8fe..8b210adca 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -219,7 +219,6 @@ SECTIONS { src/birch_pc.o(.text); src/hof_pc.o(.text); src/field_specials.o(.text); - asm/field_specials.o(.text); asm/battle_records.o(.text); src/battle_records.o(.text); asm/battle_records.o(.text_8110494); @@ -441,7 +440,7 @@ SECTIONS { data/pokeblock.o(.rodata); data/fldeff_flash.o(.rodata); src/time_events.o(.rodata); - data/field_specials.o(.rodata); + src/field_specials.o(.rodata); data/pokedex_area_screen.o(.rodata); data/evolution_scene.o(.rodata); data/roulette.o(.rodata); |