summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 8777bfbd8..2e75d4eda 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,8 +59,7 @@ SECTIONS {
src/battle/battle_7.o(.text);
src/battle/battle_controller_opponent.o(.text);
asm/battle_9.o(.text);
- asm/battle_controller_linkopponent1.o(.text);
- src/battle/battle_controller_linkopponent2.o(.text);
+ src/battle/battle_controller_linkopponent.o(.text);
src/pokemon/pokemon_1.o(.text);
src/battle/calculate_base_damage.o(.text);
src/pokemon/pokemon_2.o(.text);
@@ -235,9 +234,7 @@ SECTIONS {
asm/field_effect_helpers.o(.text);
asm/contest_ai.o(.text);
asm/battle_anim_81258BC.o(.text);
- asm/battle_controller_safari.o(.text);
src/battle/battle_controller_safari.o(.text);
- asm/battle_controller_safari.o(.text_812BBFC);
src/field/fldeff_sweetscent.o(.text);
asm/battle_anim_812C144.o(.text);
src/pokemon/learn_move.o(.text);
@@ -330,7 +327,7 @@ SECTIONS {
src/battle/battle_controller_player.o(.rodata);
data/data2b.o(.rodata);
src/battle/battle_controller_opponent.o(.rodata);
- src/battle/battle_controller_linkopponent2.o(.rodata);
+ src/battle/battle_controller_linkopponent.o(.rodata);
data/battle_moves.o(.rodata);
src/battle/battle_3.o(.rodata);
src/pokemon/pokemon_data.o(.rodata);