fixing conflicts

1 files changed, 31 insertions, 25 deletions

diff --git a/ld_script.txt b/ld_script.txt
index c43906b68..070017666 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -55,12 +55,12 @@ SECTIONS {
         asm/battle_2.o(.text);
         src/battle_3.o(.text);
         src/battle_4.o(.text);
-        asm/battle_5.o(.text);
-        src/battle_6.o(.text);
+        src/battle_controller_player.o(.text);
         src/battle_7.o(.text);
-        src/battle_8.o(.text);
+        src/battle_controller_opponent.o(.text);
         asm/battle_9.o(.text);
-        src/battle_10.o(.text);
+        asm/battle_controller_linkopponent1.o(.text);
+        src/battle_controller_linkopponent2.o(.text);
         src/pokemon_1.o(.text);
         src/calculate_base_damage.o(.text);
         src/pokemon_2.o(.text);
@@ -83,7 +83,7 @@ SECTIONS {
         asm/trade.o(.text.sub_804A9F4);
         src/trade.o(.text.sub_804DAD4);
         asm/trade.o(.text.sub_804DB2C);
-        asm/berry_blender.o(.text);
+        src/berry_blender.o(.text);
         src/play_time.o(.text);
         src/new_game.o(.text);
         src/rom4.o(.text);
@@ -120,7 +120,7 @@ SECTIONS {
         src/battle_anim.o(.text);
         src/rom_8077ABC.o(.text);
         src/task.o(.text);
-        asm/reshow_battle_screen.o(.text);
+        src/reshow_battle_screen.o(.text);
         src/battle_anim_807B69C.o(.text);
         src/title_screen.o(.text);
         src/field_weather.o(.text);
@@ -159,7 +159,6 @@ SECTIONS {
         src/matsuda_debug_menu.o(.text);
         asm/contest.o(.text);
         src/shop.o(.text);
-        asm/shop.o(.text);
         src/berry.o(.text);
         src/script_menu.o(.text);
         src/naming_screen.o(.text);
@@ -181,6 +180,7 @@ SECTIONS {
         asm/contest_link_80C857C.o(.text);
         src/contest_link_80C857C.o(.text);
         src/item_use.o(.text);
+		src/battle_anim_80CA710.o(.text);
         asm/battle_anim_80CA710.o(.text);
         src/bike.o(.text);
         asm/easy_chat.o(.text);
@@ -197,6 +197,7 @@ SECTIONS {
         src/dewford_trend.o(.text);
         src/heal_location.o(.text);
         src/region_map.o(.text);
+        src/cute_sketch.o(.text);
         asm/cute_sketch.o(.text);
         src/decoration.o(.text);
         asm/slot_machine.o(.text);
@@ -226,9 +227,9 @@ SECTIONS {
         src/coins.o(.text);
         src/landmark.o(.text);
         src/fldeff_strength.o(.text);
-        asm/battle_transition.o(.text);
-        src/battle_811DA74.o(.text);
-        asm/battle_message.o(.text);
+        src/battle_transition.o(.text);
+        src/battle_controller_linkpartner.o(.text);
+        src/battle_message.o(.text);
         src/choose_party.o(.text);
         asm/cable_car.o(.text);
         asm/roulette_util.o(.text);
@@ -239,17 +240,18 @@ SECTIONS {
         asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_81258BC.o(.text);
-        src/battle_anim_81258BC.o(.text);
-        asm/battle_anim_81258BC.o(.text_812BBFC);
+        asm/battle_controller_safari.o(.text);
+        src/battle_controller_safari.o(.text);
+        asm/battle_controller_safari.o(.text_812BBFC);
         src/fldeff_sweetscent.o(.text);
         asm/battle_anim_812C144.o(.text);
-        asm/learn_move.o(.text);
+        src/learn_move.o(.text);
         src/fldeff_softboiled.o(.text);
         src/decoration_inventory.o(.text);
         src/roamer.o(.text);
         asm/battle_tower.o(.text);
         src/use_pokeblock.o(.text);
-        src/battle_anim_8137220.o(.text);
+        src/battle_controller_wally.o(.text);
         src/player_pc.o(.text);
         src/intro.o(.text);
         src/field_region_map.o(.text);
@@ -262,10 +264,10 @@ SECTIONS {
         src/mystery_event_menu.o(.text);
         src/save_failed_screen.o(.text);
         src/braille_puzzles.o(.text);
-        asm/pokeblock_feed.o(.text);
+        src/pokeblock_feed.o(.text);
         src/clear_save_data_menu.o(.text);
         src/intro_credits_graphics.o(.text);
-        asm/evolution_graphics.o(.text);
+        src/evolution_graphics.o(.text);
         src/bard_music.o(.text);
         src/fldeff_teleport.o(.text);
         src/unknown_debug_menu.o(.text);
@@ -330,7 +332,11 @@ SECTIONS {
         data/main_menu.o(.rodata);
         data/data2a.o(.rodata);
         src/battle_4.o(.rodata);
+        src/battle_controller_player.o(.rodata);
         data/data2b.o(.rodata);
+        src/battle_controller_opponent.o(.rodata);
+        src/battle_controller_linkopponent2.o(.rodata);
+        data/battle_moves.o(.rodata);
         src/battle_3.o(.rodata);
         src/pokemon_data.o(.rodata);
         . = ALIGN(4);
@@ -341,7 +347,7 @@ SECTIONS {
         data/battle_interface.o(.rodata);
         src/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);
@@ -397,7 +403,7 @@ SECTIONS {
         src/item.o(.rodata);
         data/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
-        data/shop.o(.rodata);
+        src/shop.o(.rodata);
         src/berry.o(.rodata);
         src/script_menu.o(.rodata);
         src/naming_screen.o(.rodata);
@@ -443,22 +449,22 @@ SECTIONS {
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
         data/landmark.o(.rodata);
-        data/battle_transition.o(.rodata);
-        data/battle_811DA74.o(.rodata);
+        src/battle_transition.o(.rodata);
+        src/battle_controller_linkpartner.o(.rodata);
         data/battle_message.o(.rodata);
         src/choose_party.o(.rodata);
         data/cable_car.o(.rodata);
         src/save.o(.rodata);
         data/field_effect_helpers.o(.rodata);
         data/contest_ai.o(.rodata);
-        data/battle_anim_81258BC.o(.rodata);
+        src/battle_controller_safari.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
-        data/learn_move.o(.rodata);
+        src/learn_move.o(.rodata);
         src/decoration_inventory.o(.rodata);
         src/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
         src/use_pokeblock.o(.rodata);
-        data/battle_anim_8137220.o(.rodata);
+        src/battle_controller_wally.o(.rodata);
         src/player_pc.o(.rodata);
         src/intro.o(.rodata);
         data/battle_anim_813F0F4.o(.rodata);
@@ -470,9 +476,9 @@ SECTIONS {
         src/strings.o(.rodata);
         src/berry_tag_screen.o(.rodata);
         src/save_failed_screen.o(.rodata);
-        data/pokeblock_feed.o(.rodata);
+        src/pokeblock_feed.o(.rodata);
         data/intro_credits_graphics.o(.rodata);
-        data/evolution_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
         data/bard_music.o(.rodata);
         data/unknown_debug_menu.o(.rodata);
         data/strings2.o(.rodata);