Merge branch 'master' into secret_base

1 files changed, 22 insertions, 22 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 9cbbb17e0..88c2772e7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -61,11 +61,11 @@ SECTIONS {
         src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
         asm/battle_5.o(.text);
-        asm/battle_controller_player.o(.text);
+        src/battle_controller_player.o(.text);
         asm/battle_7.o(.text);
-        asm/battle_controller_opponent.o(.text);
+        src/battle_controller_opponent.o(.text);
         src/battle_ai_switch_items.o(.text);
-        asm/battle_controller_linkopponent.o(.text);
+        src/battle_controller_link_opponent.o(.text);
         src/pokemon_1.o(.text);
         asm/pokemon_1.o(.text);
         src/calculate_base_damage.o(.text);
@@ -114,7 +114,7 @@ SECTIONS {
         src/palette.o(.text);
         src/sound.o(.text);
         src/battle_anim.o(.text);
-        asm/rom_80A5C6C.o(.text);
+        asm/battle_anim_80A5C6C.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
         asm/battle_anim_80A9C70.o(.text);
@@ -180,7 +180,7 @@ SECTIONS {
         asm/rom6.o(.text);
         asm/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
-        asm/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         asm/roulette.o(.text);
         asm/pokedex_cry_screen.o(.text);
         src/coins.o(.text);
@@ -188,7 +188,7 @@ SECTIONS {
         asm/landmark.o(.text);
         asm/fldeff_strength.o(.text);
         asm/battle_transition.o(.text);
-        asm/battle_controller_linkpartner.o(.text);
+        src/battle_controller_link_partner.o(.text);
         src/battle_message.o(.text);
         asm/cable_car.o(.text);
         asm/math_util.o(.text);
@@ -199,7 +199,7 @@ SECTIONS {
         asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_sound_tasks.o(.text);
-        asm/battle_controller_safari.o(.text);
+        src/battle_controller_safari.o(.text);
         asm/fldeff_sweetscent.o(.text);
         asm/battle_anim_815A0D4.o(.text);
         asm/learn_move.o(.text);
@@ -208,7 +208,7 @@ SECTIONS {
         src/roamer.o(.text);
         asm/battle_tower.o(.text);
         asm/use_pokeblock.o(.text);
-        asm/battle_controller_wally.o(.text);
+        src/battle_controller_wally.o(.text);
         asm/player_pc.o(.text);
         asm/intro.o(.text);
         src/reset_save_heap.o(.text);
@@ -225,14 +225,14 @@ SECTIONS {
         asm/pokeblock_feed.o(.text);
         src/clear_save_data_screen.o(.text);
         asm/intro_credits_graphics.o(.text);
-        asm/evolution_graphics.o(.text);
+        src/evolution_graphics.o(.text);
         asm/bard_music.o(.text);
         asm/fldeff_teleport.o(.text);
         asm/battle_link_817C95C.o(.text);
         asm/pokemon_animation.o(.text);
         asm/recorded_battle.o(.text);
-        asm/battle_controller_recorded_opponent.o(.text);
-        asm/battle_controller_recorded_player.o(.text);
+        src/battle_controller_recorded_opponent.o(.text);
+        src/battle_controller_recorded_player.o(.text);
         src/battle_dome_cards.o(.text);
         src/lilycove_lady.o(.text);
         asm/battle_frontier_1.o(.text);
@@ -250,7 +250,7 @@ SECTIONS {
         src/unk_text_util_2.o(.text);
         src/multiboot.o(.text);
         asm/unk_81BAD84.o(.text);
-        asm/battle_controller_player_partner.o(.text);
+        src/battle_controller_player_partner.o(.text);
         asm/fldeff_groundshake.o(.text);
         asm/fossil_specials.o(.text);
         src/berry_fix_program.o(.text);
@@ -335,10 +335,10 @@ SECTIONS {
         src/battle_2.o(.rodata);
         src/battle_util.o(.rodata);
         src/battle_script_commands.o(.rodata);
-        data/battle_controller_player.o(.rodata);
+        src/battle_controller_player.o(.rodata);
         data/smokescreen.o(.rodata);
-        data/battle_controller_opponent.o(.rodata);
-        data/battle_controller_link_opponent.o(.rodata);
+        src/battle_controller_opponent.o(.rodata);
+        src/battle_controller_link_opponent.o(.rodata);
         data/data2c.o(.rodata);
         src/trig.o(.rodata);
         src/util.o(.rodata);
@@ -418,19 +418,19 @@ SECTIONS {
         data/contest_painting.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
         data/data4.o(.rodata);
-        data/battle_controller_link_partner.o(.rodata);
+        src/battle_controller_link_partner.o(.rodata);
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
         data/save.o(.rodata);
         data/field_effect_helpers.o(.rodata);
         data/contest_ai.o(.rodata);
-        data/battle_controller_safari.o(.rodata);
+        src/battle_controller_safari.o(.rodata);
         data/battle_anim_815A0D4.o(.rodata);
         data/learn_move.o(.rodata);
         src/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
         data/use_pokeblock.o(.rodata);
-        data/battle_controller_wally.o(.rodata);
+        src/battle_controller_wally.o(.rodata);
         data/player_pc.o(.rodata);
         data/intro.o(.rodata);
         data/field_region_map.o(.rodata);
@@ -447,11 +447,11 @@ SECTIONS {
         data/pokeblock_feed.o(.rodata);
         src/clear_save_data_screen.o(.rodata);
         data/intro_credits_graphics.o(.rodata);
-        data/evolution_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
         data/bard_music.o(.rodata);
         data/data_860A4AC.o(.rodata);
-        data/battle_controller_recorded_opponent.o(.rodata);
-        data/battle_controller_recorded_player.o(.rodata);
+        src/battle_controller_recorded_opponent.o(.rodata);
+        src/battle_controller_recorded_player.o(.rodata);
         src/battle_dome_cards.o(.rodata);
         src/lilycove_lady.o(.rodata);
         data/battle_frontier_1.o(.rodata);
@@ -465,7 +465,7 @@ SECTIONS {
         data/battle_tent.o(.rodata);
         src/unk_text_util_2.o(.rodata);
         data/unk_81BAD84.o(.rodata);
-        data/battle_controller_player_partner.o(.rodata);
+        src/battle_controller_player_partner.o(.rodata);
         data/fossil_special_fldeff_groundshake.o(.rodata);
         src/berry_fix_program.o(.rodata);
         data/pokemon_summary_screen.o(.rodata);