diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-19 19:42:32 -0500 |
| commit | d273493cbb1ef8ecda5c87908d07fffc1d68cd6f (patch) | |
| tree | a08642a5b0d91c17f1ccf7bf2d69c321ddd653d4 /ld_script.txt | |
| parent | fcc94f9722609ffa67c045cf8a7539690a68b080 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index d6b3953fe..0fb325602 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -58,7 +58,7 @@ SECTIONS { src/decompress.o(.text); asm/battle_1.o(.text); asm/battle_2.o(.text); - asm/battle_3.o(.text); + src/battle_3.o(.text); src/battle_4.o(.text); asm/battle_4.o(.text); asm/battle_5.o(.text); @@ -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) |