Merge origin/master into pikalaxalt/link

1 files changed, 21 insertions, 13 deletions

diff --git a/ld_script.txt b/ld_script.txt
index ee24d7903..17a6fd8e4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -63,9 +63,9 @@ SECTIONS {
         src/battle_2.o(.text);
         src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
-        asm/battle_5.o(.text);
+        src/battle_util2.o(.text);
         src/battle_controller_player.o(.text);
-        asm/battle_7.o(.text);
+        src/battle_gfx_sfx_util.o(.text);
         src/battle_controller_opponent.o(.text);
         src/battle_ai_switch_items.o(.text);
         src/battle_controller_link_opponent.o(.text);
@@ -88,6 +88,7 @@ SECTIONS {
         src/load_save.o(.text);
         asm/load_save.o(.text);
         asm/trade.o(.text);
+        src/berry_blender.o(.text);
         asm/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
@@ -132,6 +133,7 @@ SECTIONS {
         asm/option_menu.o(.text);
         asm/pokedex.o(.text);
         asm/trainer_card.o(.text);
+        src/pokemon_storage_system.o(.text);
         asm/pokemon_storage_system.o(.text);
         asm/pokemon_icon.o(.text);
         asm/script_movement.o(.text);
@@ -170,15 +172,15 @@ SECTIONS {
         src/mail.o(.text);
         asm/menu_helpers.o(.text);
         asm/dewford_trend.o(.text);
-        asm/heal_location.o(.text);
-        asm/region_map.o(.text);
+        src/heal_location.o(.text);
+        src/region_map.o(.text);
         asm/cute_sketch.o(.text);
         src/decoration.o(.text);
         asm/slot_machine.o(.text);
         asm/contest_painting.o(.text);
         src/battle_ai_script_commands.o(.text);
         asm/trader.o(.text);
-        asm/starter_choose.o(.text);
+        src/starter_choose.o(.text);
         asm/wallclock.o(.text);
         asm/rom6.o(.text);
         asm/battle_records.o(.text);
@@ -215,9 +217,9 @@ SECTIONS {
         asm/player_pc.o(.text);
         asm/intro.o(.text);
         src/reset_save_heap.o(.text);
-        asm/field_region_map.o(.text);
+        src/field_region_map.o(.text);
         asm/battle_anim_8170478.o(.text);
-        asm/hall_of_fame.o(.text);
+        src/hall_of_fame.o(.text);
         asm/credits.o(.text);
         src/lottery_corner.o(.text);
         src/diploma.o(.text);
@@ -349,13 +351,15 @@ SECTIONS {
         src/util.o(.rodata);
         data/daycare.o(.rodata);
         src/egg_hatch.o(.rodata);
-        data/battle_7.o(.rodata);
+        src/battle_gfx_sfx_util.o(.rodata);
         src/battle_interface.o(.rodata);
         data/pokeball.o(.rodata);
         data/trade.o(.rodata);
-        data/berry_blender.o(.rodata);
+        src/berry_blender.o(.rodata);
         src/new_game.o(.rodata);
         data/rom4.o(.rodata);
+        data/tilesets.o(.rodata);
+        data/maps.o(.rodata);
         data/fieldmap.o(.rodata);
         src/metatile_behavior.o(.rodata);
         data/rom_8486FEC.o(.rodata);
@@ -376,6 +380,8 @@ SECTIONS {
         data/battle_anims.o(.rodata);
         src/battle_anim.o(.rodata);
         data/rom_8525F58.o(.rodata);
+        data/map_events.o(.rodata);
+        data/battle_anim_80A9C70.o(.rodata);
         data/title_screen.o(.rodata);
         data/field_screen.o(.rodata);
         data/battle_setup.o(.rodata);
@@ -415,14 +421,16 @@ SECTIONS {
         data/mauville_old_man.o(.rodata);
         src/mail.o(.rodata);
         data/menu_helpers.o(.rodata);
-        data/heal_location.o(.rodata);
-        data/region_map.o(.rodata);
+        src/heal_location.o(.rodata);
+        src/region_map.o(.rodata);
         data/cute_sketch.o(.rodata);
         src/decoration.o(.rodata);
         data/slot_machine.o(.rodata);
         data/contest_painting.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
         data/data4.o(.rodata);
+        data/starter_choose.o(.rodata);
+        data/data4c.o(.rodata);
         src/battle_controller_link_partner.o(.rodata);
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
@@ -438,9 +446,9 @@ SECTIONS {
         src/battle_controller_wally.o(.rodata);
         data/player_pc.o(.rodata);
         data/intro.o(.rodata);
-        data/field_region_map.o(.rodata);
+        src/field_region_map.o(.rodata);
         data/battle_anim_8170478.o(.rodata);
-        data/hall_of_fame.o(.rodata);
+        src/hall_of_fame.o(.rodata);
         data/credits.o(.rodata);
         src/lottery_corner.o(.rodata);
         src/diploma.o(.rodata);