diff options
author | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
---|---|---|
committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
commit | ffeca135bcaa449267bc7540f25eeb02cf4c92fa (patch) | |
tree | 4d9ca1668dc8b49a739c3bb8f83b453f20e2e41d /ld_script.txt | |
parent | a200d9406b15f722b34775050f6fe73894d23629 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index a6971b8d1..5da05cf4b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -86,7 +86,7 @@ SECTIONS { src/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); - asm/overworld.o(.text); + src/overworld.o(.text); asm/fieldmap.o(.text); src/metatile_behavior.o(.text); asm/field_camera.o(.text); @@ -393,7 +393,7 @@ SECTIONS { data/trade.o(.rodata); src/berry_blender.o(.rodata); src/new_game.o(.rodata); - data/overworld.o(.rodata); + src/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); data/fieldmap.o(.rodata); |