diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
| commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /ld_script.txt | |
| parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
Merge branch 'master' into trader
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index bd26f78eb..929e5940d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -137,7 +137,6 @@ SECTIONS { src/item_menu_icons.o(.text); asm/battle_anim_80D51AC.o(.text); src/item.o(.text); - asm/item.o(.text); asm/contest.o(.text); asm/shop.o(.text); src/berry.o(.text); @@ -184,7 +183,7 @@ SECTIONS { src/birch_pc.o(.text); src/hof_pc.o(.text); asm/field_specials.o(.text); - asm/battle_records.o(.text); + src/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); asm/roulette.o(.text); @@ -473,7 +472,7 @@ SECTIONS { src/fldeff_flash.o(.rodata); src/time_events.o(.rodata); data/field_specials.o(.rodata); - data/battle_records.o(.rodata); + src/battle_records.o(.rodata); data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); |