summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-19 20:55:05 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-19 20:55:05 -0400
commit2c07b94e94115d89aec51cd6fd0600ce73fbb675 (patch)
treeefca127a29d73451e42898ce4fb016fd6e9e4c83 /ld_script.txt
parent60f8369a898a121691c1e29ea5235407ac282f49 (diff)
parentf94074b6027d1efe067fd972127eb7730cbef2e0 (diff)
Merge branch 'master' into berry_fix_program
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 04d3a3690..7a8ef29a1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -96,7 +96,7 @@ SECTIONS {
asm/field_camera.o(.text);
asm/field_door.o(.text);
asm/field_player_avatar.o(.text);
- asm/field_map_obj.o(.text);
+ src/field_map_obj.o(.text);
asm/field_ground_effect.o(.text);
asm/map_obj_8097404.o(.text);
asm/field_message_box.o(.text);
@@ -340,6 +340,8 @@ SECTIONS {
src/trig.o(.rodata);
src/util.o(.rodata);
data/data3.o(.rodata);
+ data/field_map_obj.o(.rodata);
+ data/data3.o(.rodata_b);
src/berry.o(.rodata);
data/data3_a1.o(.rodata);
src/pokemon_size_record.o(.rodata)