summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt4
-rw-r--r--src/battle_controller_linkopponent.c (renamed from src/battle_controller_linkopponent2.c)0
2 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 755a5b855..87f8030cb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,7 @@ SECTIONS {
src/battle_7.o(.text);
src/battle_controller_opponent.o(.text);
asm/battle_9.o(.text);
- src/battle_controller_linkopponent2.o(.text);
+ src/battle_controller_linkopponent.o(.text);
src/pokemon_1.o(.text);
src/calculate_base_damage.o(.text);
src/pokemon_2.o(.text);
@@ -327,7 +327,7 @@ SECTIONS {
src/battle_controller_player.o(.rodata);
data/data2b.o(.rodata);
src/battle_controller_opponent.o(.rodata);
- src/battle_controller_linkopponent2.o(.rodata);
+ src/battle_controller_linkopponent.o(.rodata);
data/battle_moves.o(.rodata);
src/battle_3.o(.rodata);
src/pokemon_data.o(.rodata);
diff --git a/src/battle_controller_linkopponent2.c b/src/battle_controller_linkopponent.c
index 93c6671e5..93c6671e5 100644
--- a/src/battle_controller_linkopponent2.c
+++ b/src/battle_controller_linkopponent.c