summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rwxr-xr-xld_script.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/ld_script.txt b/ld_script.txt
index d9cf9bf7d..efd2c1d35 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -56,9 +56,7 @@ SECTIONS {
asm/battle_3.o(.text);
asm/battle_4.o(.text);
asm/battle_5.o(.text);
- asm/battle_6.o(.text);
src/battle_6.o(.text);
- asm/battle_6.o(.text_8030464);
src/battle_7.o(.text);
asm/battle_8.o(.text);
asm/battle_9.o(.text);
@@ -237,7 +235,7 @@ SECTIONS {
asm/battle_transition.o(.text);
src/battle_811DA74.o(.text);
asm/battle_message.o(.text);
- asm/choose_party.o(.text);
+ src/choose_party.o(.text);
asm/cable_car.o(.text);
asm/roulette_util.o(.text);
asm/cable_car_util.o(.text);
@@ -258,7 +256,7 @@ SECTIONS {
src/roamer.o(.text);
asm/battle_tower.o(.text);
asm/use_pokeblock.o(.text);
- asm/battle_anim_8137220.o(.text);
+ src/battle_anim_8137220.o(.text);
src/player_pc.o(.text);
src/intro.o(.text);
src/field_region_map.o(.text);
@@ -394,6 +392,7 @@ SECTIONS {
data/pokemon_menu.o(.rodata);
data/option_menu.o(.rodata);
src/pokedex.o(.rodata);
+ src/trainer_card.o(.rodata);
data/trainer_card.o(.rodata);
src/battle_party_menu.o(.rodata);
data/pokemon_storage_system.o(.rodata);
@@ -453,7 +452,7 @@ SECTIONS {
data/battle_transition.o(.rodata);
data/battle_811DA74.o(.rodata);
data/battle_message.o(.rodata);
- data/choose_party.o(.rodata);
+ src/choose_party.o(.rodata);
data/cable_car.o(.rodata);
src/save.o(.rodata);
data/field_effect_helpers.o(.rodata);