import DizzyEggg's battle controller changes

1 files changed, 16 insertions, 12 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 7ad3c3ddb..4a9775673 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);
-        src/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);
@@ -227,7 +227,7 @@ SECTIONS {
         src/landmark.o(.text);
         src/fldeff_strength.o(.text);
         src/battle_transition.o(.text);
-        src/battle_811DA74.o(.text);
+        src/battle_controller_linkpartner.o(.text);
         src/battle_message.o(.text);
         src/choose_party.o(.text);
         asm/cable_car.o(.text);
@@ -239,8 +239,9 @@ 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);
         src/learn_move.o(.text);
@@ -249,7 +250,7 @@ SECTIONS {
         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);
@@ -330,8 +331,11 @@ SECTIONS {
         data/main_menu.o(.rodata);
         data/data2a.o(.rodata);
         src/battle_4.o(.rodata);
-        src/battle_5.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/data2c.o(.rodata);
         src/battle_3.o(.rodata);
         src/pokemon_data.o(.rodata);
         . = ALIGN(4);
@@ -445,21 +449,21 @@ SECTIONS {
         data/pokedex_cry_screen.o(.rodata);
         data/landmark.o(.rodata);
         src/battle_transition.o(.rodata);
-        data/battle_811DA74.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);
         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);