diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
| commit | 3919b7130b2a8709562b012099947923a16af02d (patch) | |
| tree | fc41f69f7213aaaed914d4ceebfa58d3beb519c6 /ld_script.txt | |
| parent | 67a8ac72ec8629d2d737fcd976969303bcd056f5 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Fix merge conflicts
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 3269144da..d77c28e52 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); @@ -341,7 +341,9 @@ SECTIONS { src/util.o(.rodata); data/data3.o(.rodata); src/egg_hatch.o(.rodata); - data/data3_a0.o(.rodata); + data/data3_a0_A.o(.rodata); + data/field_map_obj.o(.rodata); + data/data3_a0_B.o(.rodata); src/berry.o(.rodata); data/data3_a1.o(.rodata); src/pokemon_size_record.o(.rodata) |