summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rwxr-xr-x[-rw-r--r--]ld_script.txt31
1 files changed, 8 insertions, 23 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 866dcff5e..b20e05223 100644..100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,7 @@ SECTIONS {
asm/battle_6.o(.text);
src/battle_6.o(.text);
asm/battle_6.o(.text_8030464);
- asm/battle_7.o(.text);
+ src/battle_7.o(.text);
asm/battle_8.o(.text);
asm/battle_9.o(.text);
asm/battle_10.o(.text);
@@ -92,8 +92,7 @@ SECTIONS {
src/field_player_avatar.o(.text);
src/field_map_obj.o(.text);
asm/field_map_obj.o(.text);
- src/field_map_obj.o(.text_b);
- asm/field_map_obj.o(.text_805fd18);
+ src/field_map_obj.o(.text_fmocb2_c);
src/field_ground_effect.o(.text);
asm/field_ground_effect.o(.text);
src/field_map_obj_helpers.o(.text);
@@ -135,16 +134,12 @@ SECTIONS {
src/trainer_see.o(.text);
src/wild_encounter.o(.text);
src/field_effect.o(.text);
- asm/field_effect.o(.text);
asm/unknown_task.o(.text);
asm/pokemon_menu.o(.text);
src/option_menu.o(.text);
src/pokedex.o(.text);
- asm/pokedex.o(.text);
src/trainer_card.o(.text);
src/save_menu_util.o(.text);
- src/rom_8094928.o(.text);
- asm/rom_8094928.o(.text);
src/battle_party_menu.o(.text);
asm/pokemon_storage_system.o(.text);
src/pokemon_storage_system.o(.text);
@@ -175,12 +170,6 @@ SECTIONS {
src/secret_base.o(.text);
asm/secret_base.o(.text_80BC1D0);
src/tv.o(.text);
- asm/tv.o(.text);
- src/tv.o(.text_a);
- asm/tv.o(.text_80BE8EC);
- src/tv.o(.dotvshow);
- asm/tv.o(.dotvshow);
- src/tv.o(.text_c);
asm/contest_link_80C2020.o(.text);
src/script_pokemon_util_80C4BF0.o(.text);
src/field_poison.o(.text);
@@ -208,9 +197,7 @@ SECTIONS {
src/heal_location.o(.text);
asm/region_map.o(.text);
asm/cute_sketch.o(.text);
- asm/decoration.o(.text);
src/decoration.o(.text);
- asm/decoration.o(.text_80FE868);
asm/slot_machine.o(.text);
src/slot_machine.o(.text);
asm/slot_machine.o(.text_8104D30)
@@ -243,7 +230,6 @@ SECTIONS {
src/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
src/battle_811DA74.o(.text);
- asm/battle_811DA74.o(.text);
asm/battle_message.o(.text);
asm/choose_party.o(.text);
asm/cable_car.o(.text);
@@ -262,13 +248,12 @@ SECTIONS {
asm/battle_anim_812C144.o(.text);
asm/learn_move.o(.text);
src/fldeff_softboiled.o(.text);
- asm/decoration_inventory.o(.text);
+ src/decoration_inventory.o(.text);
src/roamer.o(.text);
asm/battle_tower.o(.text);
asm/use_pokeblock.o(.text);
asm/battle_anim_8137220.o(.text);
src/player_pc.o(.text);
- asm/player_pc.o(.text);
src/intro.o(.text);
src/field_region_map.o(.text);
asm/battle_anim_813F0F4.o(.text);
@@ -399,10 +384,10 @@ SECTIONS {
data/trainer_see.o(.rodata);
src/wild_encounter.o(.rodata);
data/wild_encounter.o(.rodata);
- data/field_effect.o(.rodata);
+ src/field_effect.o(.rodata);
data/pokemon_menu.o(.rodata);
data/option_menu.o(.rodata);
- data/pokedex.o(.rodata);
+ src/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/battle_party_menu.o(.rodata);
data/pokemon_storage_system.o(.rodata);
@@ -443,7 +428,7 @@ SECTIONS {
src/heal_location.o(.rodata);
data/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
- data/decoration.o(.rodata);
+ src/decoration.o(.rodata);
data/slot_machine.o(.rodata);
src/contest_painting.o(.rodata);
src/battle_ai.o(.rodata);
@@ -470,12 +455,12 @@ SECTIONS {
data/battle_anim_81258BC.o(.rodata);
data/battle_anim_812C144.o(.rodata);
data/learn_move.o(.rodata);
- data/decoration_inventory.o(.rodata);
+ src/decoration_inventory.o(.rodata);
src/roamer.o(.rodata);
data/battle_tower.o(.rodata);
data/use_pokeblock.o(.rodata);
data/battle_anim_8137220.o(.rodata);
- data/player_pc.o(.rodata);
+ src/player_pc.o(.rodata);
src/intro.o(.rodata);
data/battle_anim_813F0F4.o(.rodata);
data/hall_of_fame.o(.rodata);