summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 4f99cff99..894a70d4d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -50,8 +50,7 @@ SECTIONS {
src/rom_800D42C.o(.text);
asm/battle_1.o(.text_800DC24);
src/battle/battle_2.o(.text);
- asm/battle_2.o(.text);
- src/battle/battle_3.o(.text);
+ src/battle/battle_util.o(.text);
src/battle/battle_4.o(.text);
src/battle/battle_controller_player.o(.text);
src/battle/battle_7.o(.text);
@@ -336,7 +335,7 @@ SECTIONS {
src/battle/battle_records.o(.text);
asm/pokedex_area_screen.o(.text);
src/scene/evolution_scene.o(.text);
- asm/roulette.o(.text);
+ src/roulette.o(.text);
asm/pokedex_cry_screen.o(.text);
src/pokemon/pokedex_cry_screen.o(.text);
asm/pokedex_cry_screen.o(.text_811A4F8);
@@ -348,7 +347,7 @@ SECTIONS {
src/battle/battle_message.o(.text);
src/field/choose_party.o(.text);
src/scene/cable_car.o(.text);
- asm/roulette_util.o(.text);
+ src/roulette_util.o(.text);
src/engine/cable_car_util.o(.text);
src/unused/unused_8124F94.o(.text);
src/engine/save.o(.text);
@@ -454,7 +453,7 @@ SECTIONS {
src/battle/battle_controller_opponent.o(.rodata);
src/battle/battle_controller_linkopponent.o(.rodata);
data/battle_moves.o(.rodata);
- src/battle/battle_3.o(.rodata);
+ src/battle/battle_util.o(.rodata);
src/pokemon/pokemon_data.o(.rodata);
. = ALIGN(4);
src/engine/trig.o(.rodata);